merge-recursive: avoid spurious rename/rename conflict from dir renames
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:15 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit6e7e027...e5f4a8d61597a86e7f2b6087e23a759c
tree6b588b3...6e42ded8aad682c31b51dc437da34af9copy hash to clipboard (tree)
parentbc71c4e...be7ecbb00e06c6b62bc9f0e42aee9d9bcopy hash to clipboard (diff)
merge-recursive.c
t/t6043-merge-rename-directories.sh