projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78b77c4 ed87465)
Merge branch 'ap/maint-merge-strategy-list-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:54:11 +0000 (13:54 -0800)
committerJunio 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.

1  2 
builtin-merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin-merge.c
Simple merge
Git—the stupid content tracker