directory rename detection: files/directories in the way of some renames
commitc449947a79d551be3fbef807c662d701df1c6b4f
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:57:52 +0000 (19 10:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2018 01:44:15 +0000 (20 10:44 +0900)
tree996a83ca2f9ddd22f6d70cbf1c56d3905d8a9515
parentde632e4ed3cada91f9043363eb1e24f771cd0e0a
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