merge-recursive: add handling for rename/rename/add-dest/add-dest
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:21 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:39 +0000 (14:19 -0700)
commit1ac91b3...b5f153a91c10fb236a3769541be60ae9
treec8816fc...9aaa2ca17eaf25d56ac3c004113e4200copy hash to clipboard (tree)
parente03acb8...c1f03827210235dd72578b8b26f19c51copy hash to clipboard (diff)
merge-recursive.c
t/t6042-merge-rename-corner-cases.sh