merge-recursive: fix remaining directory rename + dirty overwrite cases
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:52:03 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 22:11:58 +0000 (14:11 -0800)
commitbbafab7...326146dc9a8bcf42071574dc22fbed5e
treec8a87fc...54e45b7e30db9c0028af009098cb6cf9copy hash to clipboard (tree)
parente0052f4...13cd8f586b0b9975fedffce268ca6ce9copy hash to clipboard (diff)
merge-recursive.c
t/t6043-merge-rename-directories.sh