merge-recursive: ensure we write updates for directory-renamed file
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:52:06 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 22:11:58 +0000 (14:11 -0800)
commitc5b761f...2711542073cf1906c0e86a34616b79ae
treef127a06...756cb53996de66d88e58a8d740118bdfcopy hash to clipboard (tree)
parentfebb3a8...098f853066c2623c2392f156710dd40fcopy hash to clipboard (diff)
merge-recursive.c
t/t6043-merge-rename-directories.sh