Junio C Hamano 21bed620cd 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

2016-07-25 14:13:39 -07:00

62 KiB

Raw Blame History

View Raw