diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-19 11:11:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-19 11:11:03 -0700 |
| commit | 1fb9df724833b0d0dffaefc6886ac60247c67a0c (patch) | |
| tree | d33d087f553cd63e5e8c5550a2bb8010819856dc /t/t4108-apply-threeway.sh | |
| parent | Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com/git-l10n/git-po (diff) | |
| parent | merge-recursive: use xstrdup() instead of fixed buffer (diff) | |
| download | tgif-1fb9df724833b0d0dffaefc6886ac60247c67a0c.tar.xz | |
Merge branch 'en/rename-directory-detection-reboot'
* en/rename-directory-detection-reboot:
merge-recursive: use xstrdup() instead of fixed buffer
Diffstat (limited to 't/t4108-apply-threeway.sh')
0 files changed, 0 insertions, 0 deletions