merge-recursive: improve rename/rename(1to2)/add[/add] handling
authorElijah Newren <newren@gmail.com>
Thu, 8 Nov 2018 04:40:29 +0000 (20:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Nov 2018 05:23:53 +0000 (14:23 +0900)
commit48c9cb9...6d058bcf18e931a1ed0d88792bb506c9
tree977129b...f18dc58d9a54c4b3d5cb4d21691851d5copy hash to clipboard (tree)
parentdcf2815...98589b1fa0a01e7a8459c213581d4412copy hash to clipboard (diff)
merge-recursive.c
t/t6042-merge-rename-corner-cases.sh
t/t6043-merge-rename-directories.sh