From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Dec 2011 19:42:44 +0000 (-0800)
Subject: Merge branch 'cn/maint-lf-to-crlf-filter' into maint
X-Git-Tag: v1.7.8.1~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3bb8d69cddbcad4bd4ae3d1281c42c1aeb297355;p=git.git

Merge branch 'cn/maint-lf-to-crlf-filter' into maint

* cn/maint-lf-to-crlf-filter:
  lf_to_crlf_filter(): tell the caller we added "\n" when draining
  convert: track state in LF-to-CRLF filter
---

3bb8d69cddbcad4bd4ae3d1281c42c1aeb297355