diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:28 -0800 |
| commit | 7479ca4b44193acee43c480ae37e0bec98316f7a (patch) | |
| tree | 60792ba401dcb07ccd2ef285b3b55badc56ac525 /t/lib-httpd/apache.conf | |
| parent | Merge branch 'ls/p4-empty-file-on-lfs' into maint (diff) | |
| parent | convert: git cherry-pick -Xrenormalize did not work (diff) | |
| download | tgif-7479ca4b44193acee43c480ae37e0bec98316f7a.tar.xz | |
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
Fix a corner case in merge-recursive regression that crept in
during 2.10 development cycle.
* jc/renormalize-merge-kill-safer-crlf:
convert: git cherry-pick -Xrenormalize did not work
merge-recursive: handle NULL in add_cacheinfo() correctly
cherry-pick: demonstrate a segmentation fault
Diffstat (limited to 't/lib-httpd/apache.conf')
0 files changed, 0 insertions, 0 deletions