From: Jakub Narebski <jnareb@gmail.com>
Date: Mon, 19 Nov 2007 19:56:07 GMT
Subject: Re: git merge no longer handles add/add
Message-ID: <fhspor$9ci$1@ger.gmane.org>
In-Reply-To: <7vabpanilk.fsf@gitster.siamese.dyndns.org>

Junio C Hamano wrote:

> Exactly.  We may keep conflict markers in the file left in the
> work tree to highlight which lines are unique to the side that
> added more (iow, one group of lines delimited by <<< === >>> is
> empty while the other is not) but this is currently treated as
> "fishy, needs human validation" to catch mismerges.

BTW can xdifflib merge use original diff3 conflict markers, i.e.
<<< [main] |||| [ancestor]  === [branch] >>>?
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git