projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 684d0d8 ed87465)
Merge branch 'ap/maint-merge-strategy-list-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:44:43 +0000 (14:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:44:43 +0000 (14:44 -0800)
1  2 
builtin-merge.c patch | diff1 | diff2 | blob | history

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