directory rename detection: files/directories in the way of some renames
commit65fa3556bd83464a17f2e02cd8b0f8cc06b48e7f
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:51:42 +0000 (14 10:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:02:51 +0000 (14 13:02 -0800)
tree8494b38d1a623518b54a883a392fc864c30cd890
parent881e48bafd45f6f6fbfa0b6ea693cc21235e4195
directory rename detection: files/directories in the way of some renames

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6043-merge-rename-directories.sh