Code

Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 09:15:19 +0000 (01:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 09:15:19 +0000 (01:15 -0800)
* js/maint-merge-recursive-r-d-conflict:
  merge-recursive: mark rename/delete conflict as unmerged

1  2 
merge-recursive.c

Simple merge