Andrew's git / gitweb.git / diff
?
merge-recursive: Delay handling of rename/delete conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:02 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:04 +0000 (17:37 -0700)
Move the handling of rename/delete conflicts from process_renames() to
process_df_entry().

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found