Don't expand CRLFs when normalizing text during merge
authorEyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Fri, 2 Jul 2010 19:20:49 +0000 (21:20 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Jul 2010 22:45:18 +0000 (15:45 -0700)
commit43dd233...853b2460a5252b0f43d8de3c5b545b9a
tree320c358...a8f16d83c76fb49492f988e3ae4f7c3fcopy hash to clipboard (tree)
parent331a183...b26c3032bec27b66307a9de9b3b11509copy hash to clipboard (diff)
convert.c