Code

Merge branch 'jc/maint-lf-to-crlf-keep-crlf'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:29 +0000 (11:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:29 +0000 (11:27 -0800)
commit339aff0846ccf21905d047c20e3c7d077d6f300b
tree51f1d8361a6607751f86919f331280340492f8ca
parente927c1675171a24823c8683fd48768024795c996
parent8496f568739626c86cb9d82e57fc0b55cb4c0849
Merge branch 'jc/maint-lf-to-crlf-keep-crlf'

* jc/maint-lf-to-crlf-keep-crlf:
  lf_to_crlf_filter(): resurrect CRLF->CRLF hack
convert.c