From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Dec 2011 19:42:27 +0000 (-0800)
Subject: Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
X-Git-Tag: v1.7.8.2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/23838b8a152a6363e22fdbe3f474fab904f701b3?hp=--cc

Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint

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

23838b8a152a6363e22fdbe3f474fab904f701b3