diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:52 -0700 |
| commit | 7f5885ad2abfbf9b760e2f32f70537d1c380734d (patch) | |
| tree | f2a636bb35db7ea784c2ae08259cfca6bfb6a1a6 /t/helper | |
| parent | Merge branch 'jk/common-main' into maint (diff) | |
| parent | merge: avoid "safer crlf" during recording of merge results (diff) | |
| download | tgif-7f5885ad2abfbf9b760e2f32f70537d1c380734d.tar.xz | |
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
"git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.
* jc/renormalize-merge-kill-safer-crlf:
merge: avoid "safer crlf" during recording of merge results
convert: unify the "auto" handling of CRLF
Diffstat (limited to 't/helper')
0 files changed, 0 insertions, 0 deletions