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

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/gitattributes.txt
Simple merge

diff --cc cache.h
Simple merge

diff --cc merge-recursive.c
Simple merge

diff --cc read-cache.c
Simple merge