From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Mar 2008 16:01:06 GMT
Subject: Re: [PATCH] merge-recursive: handle file mode changes
Message-ID: <7vd4pxqoql.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080314121752.GB3315@localhost>

Clemens Buchacher <drizzd@aon.at> writes:

>> Reading the rest of the function, I notice that it consistently favor "a"
>> over "b", when a conflict cannot be reconciled.
>
> Indeed. I think "b" should be favored over "a", however.

Why?