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)
commit8b026ed...c3104ecc40a68fd58b764fb3c717babb
treed42982d...7593d566b4ba43b06f23f86014124d40copy hash to clipboard (tree)
parent26e47e2...1e969491ad4e3b6c298450c061749c9ecopy hash to clipboard (diff)
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