Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:42:27 +0000 (11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:42:27 +0000 (11:42 -0800)
commit23838b8...152a6363e22fdbe3f474fab904f701b3
tree987a3bc...1fe943cd3ffba1eb112e4d9c955f233ccopy hash to clipboard (tree)
parente8f6b51...6bcc904b8a5fed831f718c3f9ed7ef34copy hash to clipboard (diff)
parent8496f56...739626c86cb9d82e57fc0b55cb4c0849copy hash to clipboard (diff)
convert.c