From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 01 Jul 2010 03:33:08 GMT
Subject: Re: [PATCH] Clarify text filter merge conflict reduction docs
Message-ID: <7vd3v7511n.fsf@alter.siamese.dyndns.org>
In-Reply-To: <0CF2361E-D010-4042-B481-6918BE2A9341@gmail.com>

Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> writes:

>> +	if (!core_ll_merge_double_convert)
>> +		return sha_eq(o_sha, a_sha);
>
> I would rather do this:
>
> 	if (sha_eq(o_sha, a_sha))
> 		return 1;
> 	if (!core_ll_merge_double_convert)
> 		return 0;

You are absolutely right.  This part of my patch was an unnecessary
pessimization.

Will fix.