Merge branch 'cn/maint-lf-to-crlf-filter' into next
commit83d6f7cebf2f784d716d4f8d5986b978f0133b63
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:40:53 +0000 (20 13:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 21:40:53 +0000 (20 13:40 -0800)
tree37579d1c3d14595ca309be92fa8609d46192f942
parentd441111b62d6341a0a7faf9c80bbdea6f52286ef
parent87afe9a5ed759668e35513c44eacd2fd393ba658
Merge branch 'cn/maint-lf-to-crlf-filter' into next

* cn/maint-lf-to-crlf-filter:
  lf_to_crlf_filter(): tell the caller we added "\n" when draining
convert.c