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)
commit71f7ffc...02a2f38436c59146b86897389130a538
treee28a7ef...fae0ced88c94362c854e91ff443afb55copy hash to clipboard (tree)
parent882fd11...ff6f0e8add77e75924678cce875a0eafcopy hash to clipboard (diff)
merge-recursive.c