From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jun 2018 18:11:03 +0000 (-0700)
Subject: Merge branch 'en/rename-directory-detection-reboot'
X-Git-Tag: v2.18.0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fb9df724833b0d0dffaefc6886ac60247c67a0c;p=thirdparty%2Fgit.git

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

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

1fb9df724833b0d0dffaefc6886ac60247c67a0c