Merge branch 'cn/maint-lf-to-crlf-filter' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:44 +0000 (11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:44 +0000 (11:42 -0800)
commit3bb8d69...ddbcad4bd4ae3d1281c42c1aeb297355
treef7fd3cf...157af8a870c2e011b7e8fe8b5ba0691dcopy hash to clipboard (tree)
parent1a7bd4f...fa0c57617828dfc1b6b525af674f6d49copy hash to clipboard (diff)
parent87afe9a...ed759668e35513c44eacd2fd393ba658copy hash to clipboard (diff)
convert.c