From: Johannes Sixt <j.sixt@viscovery.net>
Date: Fri, 25 Jun 2010 05:45:28 GMT
Subject: Re: [PATCH v3 3/3] Don't expand CRLFs when normalizing text during merge
Message-ID: <4C244278.10407@viscovery.net>
In-Reply-To: <90f38b5f5c49f9b9f5427a026e51f867a1121982.1277408598.git.eyvind.bernhardsen@gmail.com>

Am 6/24/2010 22:44, schrieb Eyvind Bernhardsen:
> There's no need to expand CRLFs when convert_to_working_tree() is called
> to normalize text for a merge since the text will be converted back
> immediately.  Improves performance of merges with conflicting line
> endings when core.eol=crlf or core.autocrlf=true.

Pardon me, first you make a big deal about normalization for merges, only
that you finally omit it? What am I missing?

BTW, most of the new functions you introduced violate the style: they
should have the opening brace on the next line.

-- Hannes