Eyvind Bernhardsen 43dd233285 Don't expand CRLFs when normalizing text during merge ...

Disable CRLF expansion when convert_to_working_tree() is called from
normalize_buffer().  This improves performance when merging branches
with conflicting line endings when core.eol=crlf or core.autocrlf=true
by making the normalization act as if core.eol=lf.

Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-07-02 15:45:18 -07:00

18 KiB

Raw Blame History

View Raw