| commit | 1fb9df724833b0d0dffaefc6886ac60247c67a0c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jun 2018 18:11:03 +0000 (19 11:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jun 2018 18:11:03 +0000 (19 11:11 -0700) | ||
| tree | d33d087f553cd63e5e8c5550a2bb8010819856dc | treesnapshot (tar.gz zip) |
| parent | f0ac6e39433c1d7e9339207aa4d01e9bf7a05b8a | commitdiff |
| parent | 94eff2b69a3dc662edac9984a08241d033e764d7 | commitdiff |
Merge branch 'en/rename-directory-detection-reboot'
* en/rename-directory-detection-reboot:
merge-recursive: use xstrdup() instead of fixed buffer
* en/rename-directory-detection-reboot:
merge-recursive: use xstrdup() instead of fixed buffer