![[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) |
* ap/maint-merge-strategy-list-fix:
builtin-merge.c: call exclude_cmds() correctly.
builtin-merge.c: call exclude_cmds() correctly.
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-merge.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-merge.c
Simple merge