| commit | 21bed620cd2d4fc4fb3d42447136c9f899ede5bb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jul 2016 21:13:38 +0000 (25 14:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jul 2016 21:13:39 +0000 (25 14:13 -0700) | ||
| tree | 55fe7e104798ec1689d4e3513e81563a0188317f | treesnapshot (tar.gz zip) |
| parent | fc08d2d4add543b88d7e1573cb4be01adedfed00 | commitdiff |
| parent | 1335d76e4569fa84e52dc24c88c04daeae6e160e | commitdiff |
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
"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
"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