Merge branch 'jc/convert'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:16 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:16 +0000 (16:47 -0700)
* jc/convert:
convert: make it harder to screw up adding a conversion attribute
convert: make it safer to add conversion attributes
convert: give saner names to crlf/eol variables, types and functions
convert: rename the "eol" global variable to "core_eol"

Trivial merge