diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:30 -0800 |
| commit | 1749053d0278f2a533f79915f03c379e5f738b39 (patch) | |
| tree | b4de22a11564dc1248cbce10a3d7ac1c5129e81f /.travis.yml | |
| parent | Merge branch 'jt/use-trailer-api-in-commands' (diff) | |
| parent | convert: git cherry-pick -Xrenormalize did not work (diff) | |
| download | tgif-1749053d0278f2a533f79915f03c379e5f738b39.tar.xz | |
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
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 '.travis.yml')
0 files changed, 0 insertions, 0 deletions