![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Dec 2009 21:54:11 +0000 (13:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Dec 2009 21:54:11 +0000 (13:54 -0800) | ||
| commit | 99292c638a5c011ce453c904357185d9f6c7dd62 | |
| tree | 104fca741d5078b3b41f1ecc38951aa34ef4dcf5 | tree | snapshot |
| parent | 78b77c491ff21e27dbaf1381268aeb380f0607b8 | commit | diff |
| parent | ed87465658c83a5a1617920e7b605bd830a78aed | commit | diff |
Merge branch 'ap/maint-merge-strategy-list-fix' into maint
* ap/maint-merge-strategy-list-fix:
builtin-merge.c: call exclude_cmds() correctly.
* ap/maint-merge-strategy-list-fix:
builtin-merge.c: call exclude_cmds() correctly.
| builtin-merge.c | diff1 | | diff2 | | blob | history |