merge-recursive: avoid spurious rename/rename conflict from dir renames
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:52:05 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 22:11:58 +0000 (14:11 -0800)
commitfebb3a8...098f853066c2623c2392f156710dd40f
tree291b95a...e28dfa2508eb5e951cecef25450ff77acopy hash to clipboard (tree)
parent8f581e3...470fa92e99b28974f68ee2d23230d1c9copy hash to clipboard (diff)
merge-recursive.c
t/t6043-merge-rename-directories.sh