From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Dec 2009 21:54:11 +0000 (-0800)
Subject: Merge branch 'ap/maint-merge-strategy-list-fix' into maint
X-Git-Tag: v1.6.5.5~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/99292c638a5c011ce453c904357185d9f6c7dd62?ds=inline;hp=--cc

Merge branch 'ap/maint-merge-strategy-list-fix' into maint

* ap/maint-merge-strategy-list-fix:
builtin-merge.c: call exclude_cmds() correctly.
---

99292c638a5c011ce453c904357185d9f6c7dd62