Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:51 +0000 (21:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:52 +0000 (21:35 -0700)
"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

1  2 
Documentation/config.txt
Documentation/gitattributes.txt
cache.h
merge-recursive.c
read-cache.c
Simple merge
Simple merge
diff --cc cache.h
Simple merge
Simple merge
diff --cc read-cache.c
Simple merge