From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Dec 2011 19:27:29 +0000 (-0800)
Subject: Merge branch 'jc/maint-lf-to-crlf-keep-crlf'
X-Git-Tag: v1.7.9-rc0~20
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=339aff0846ccf21905d047c20e3c7d077d6f300b;p=git.git

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

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

339aff0846ccf21905d047c20e3c7d077d6f300b