From: Junio C Hamano Date: Fri, 9 Sep 2016 04:35:51 +0000 (-0700) Subject: Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint X-Git-Tag: v2.10.1~67 X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=7f5885ad2abfbf9b760e2f32f70537d1c380734d;p=git.git 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 --- 7f5885ad2abfbf9b760e2f32f70537d1c380734d