Merge branch 'cn/maint-lf-to-crlf-filter'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:49:45 +0000 (22:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:49:45 +0000 (22:49 -0800)
commita96a89f7153150c7e59d5481dd22773173b5a877
tree45c338e54b2c11aa9fbf91dbcb16b3534092c374
parent5c3659432da19098261737d69b7979336d5d0159
parent284e3d280ea84957f5bedcb302848dbdcdbb9a62
Merge branch 'cn/maint-lf-to-crlf-filter'

* cn/maint-lf-to-crlf-filter:
  convert: track state in LF-to-CRLF filter
convert.c