Merge branch 'en/rename-directory-detection-reboot'

* en/rename-directory-detection-reboot: merge-recursive: use xstrdup() instead of fixed buffer

Junio C Hamano committed Jun 19, 2018 at 11:11 UTC 1fb9df724833b0d0dffaefc6886ac60247c67a0c

No changes.