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

* en/rename-directory-detection-reboot:
  merge-recursive: use xstrdup() instead of fixed buffer
This commit is contained in:
Junio C Hamano 2018-06-19 11:11:03 -07:00
commit 1fb9df7248

Diff Content Not Available