Merge branch 'en/rename-directory-detection-reboot'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2018 05:38:19 +0000 (14:38 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2018 05:38:19 +0000 (14:38 +0900)
commitc67de74...f44c149747f1f4ce5f6d5d6659ba0fbc
tree18ae89e...778e7f727b459466886d034324b3f3f0copy hash to clipboard (tree)
parentc9aac55...4e99302e1e365e480eb52c3da2d7c853copy hash to clipboard (diff)
parent1de70db...1ada0069d1b6cd6345323906cc9a9ed3copy hash to clipboard (diff)
merge-recursive.c
strbuf.c
strbuf.h
t/t6022-merge-rename.sh
unpack-trees.c