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)
commit3b130ad...9c8b0b37acb0959b84a3222bc22ebcff
tree441c3ce...735d7b968cf28e7b86b01182f6f9adc0copy hash to clipboard (tree)
parent161cf7f...490285700432f23a953f8e238f3469f5copy hash to clipboard (diff)
merge-recursive.c