Merge branch 'en/rename-directory-detection-reboot'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jun 2018 18:11:03 +0000 (11:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jun 2018 18:11:03 +0000 (11:11 -0700)
* en/rename-directory-detection-reboot:
merge-recursive: use xstrdup() instead of fixed buffer

Trivial merge