From: Tupshin Harper <tupshin@tupshin.com>
Date: Thu, 28 Apr 2005 00:43:00 GMT
Subject: Re: The criss-cross merge case
Message-ID: <42703194.80409@tupshin.com>
In-Reply-To: <Pine.LNX.4.21.0504271854240.30848-100000@iabervon.org>

Daniel Barkalow wrote:

>I've been looking at Darcs (which seems to have a good method, although I
>think the underlying diff isn't great), and Codeville still doesn't have
>any documentation. Arch's method is strictly weaker than 3-way merge, and
>generates more rejects (not even conflicts) in my experience than even
>CVS. 
>
>	-Daniel
>  
>
Can you clarify what you mean by darcs' underlying diff not being that
great? It seems to function pretty much identically to gnu diff. In what
way would you want the underlying diff to be improved?

-Tupshin