From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 05 Mar 2010 22:19:50 GMT
Subject: Re: git-core: conflictstyle=diff3 doesn't actually use diff3 compatible format
Message-ID: <20100305221950.GB5083@progeny.tock>
In-Reply-To: <20100305215253.364.63583.reportbug@localhost>

Hi gitsters,

Stefan Monnier wrote [1]:

> I can't live without conflictstyle=diff3m and I'm very happy it exists.
> But it has a little problem: it uses "|||||||\n" as a separator for the
> ancestor version of the text, whereas diff3 uses "||||||| <ancestorname>\n".
> The difference is harmless for a human (tho the <ancestorname> can sometimes
> be useful, assuming it's meaningful), but it makes some tools fail to
> recognize the conflict markers properly.
> So please add a " BASE" or " ANCESTOR" after the "|||||||".

No opinion on this myself.  I’d be interested to hear from xdiff people
whether it should be easy to add the ancestor name to the output.

>
> 	Stefan
>
> PS: I intended to report this bug directly to the Git bug-tracker, but I was
> simply unable to find it.  I know I'm sometimes dense, but I did make an
> honest effort to look for it.

See http://thread.gmane.org/gmane.comp.version-control.git/136500

Short answer: the usual method is to report bugs to the list, preferably
with a patch for t/ or even better, a fix. ;-)

Jonathan

[1] http://bugs.debian.org/572720