tree d33d087f553cd63e5e8c5550a2bb8010819856dc
parent f0ac6e39433c1d7e9339207aa4d01e9bf7a05b8a
parent 94eff2b69a3dc662edac9984a08241d033e764d7
author Junio C Hamano <gitster@pobox.com> 1529431863 -0700
committer Junio C Hamano <gitster@pobox.com> 1529431863 -0700

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

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