merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:04 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:37 +0000 (14:19 -0700)
commit0a6b871...6e6a4e2649f6da23db67eeaad11d102e
tree032427c...61ac3445f35ec8426a48a5bd163b7cbccopy hash to clipboard (tree)
parent531357a...cc2b93ec68099890b835f50e462ceab7copy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh