Revert "Merge branch 'en/rename-directory-detection'"
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Apr 2018 09:07:11 +0000 (18:07 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Apr 2018 09:07:11 +0000 (18:07 +0900)
commit8b026edac3104ecc40a68fd58b764fb3c717babb
treed42982dc7593d566b4ba43b06f23f86014124d40
parent26e47e261e969491ad4e3b6c298450c061749c9e
Revert "Merge branch 'en/rename-directory-detection'"

This reverts commit e4bb62fa1eeee689744b413e29a50b4d1dae6886, reversing
changes made to 468165c1d8a442994a825f3684528361727cd8c0.

The topic appears to inflict severe regression in renaming merges,
even though the promise of it was that it would improve them.

We do not yet know which exact change in the topic was wrong, but in
the meantime, let's play it safe and revert it out of 'master'
before real Git-using projects are harmed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
merge-recursive.h
strbuf.c
strbuf.h
t/t3501-revert-cherry-pick.sh
t/t6043-merge-rename-directories.sh [deleted file]
t/t7607-merge-overwrite.sh
unpack-trees.c
unpack-trees.h