projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c6e8aa 36e3b5e)
Merge branch 'js/maint-merge-recursive-r-d-conflict'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 08:09:42 +0000 (00:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 08:09:42 +0000 (00:09 -0800)
* js/maint-merge-recursive-r-d-conflict:
  merge-recursive: mark rename/delete conflict as unmerged

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

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