merge-recursive: Fix working copy handling for rename/rename/add/add
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:22 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:39 +0000 (14:19 -0700)
commit3672c97...483020ba5255576aec0be670c76d019b
treeae5d39f...2a1a1272a5e8c72ac71c99920f950461copy hash to clipboard (tree)
parent1ac91b3...b5f153a91c10fb236a3769541be60ae9copy hash to clipboard (diff)
merge-recursive.c
t/t6042-merge-rename-corner-cases.sh