projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 882fd11) | patch
merge-recursive: Delay modify/delete conflicts if D/F conflict present
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:04 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:04 +0000 (17:37 -0700)
commit71f7ffcc02a2f38436c59146b86897389130a538
treee28a7efbfae0ced88c94362c854e91ff443afb55tree | snapshot
parent882fd11aff6f0e8add77e75924678cce875a0eafcommit | diff
merge-recursive: Delay modify/delete conflicts if D/F conflict present

When handling merges with modify/delete conflicts, if the modified path is
involved in a D/F conflict, handle the issue in process_df_entry() rather
than process_entry().

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
Git—the stupid content tracker