From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Fri, 03 Nov 2006 02:41:47 GMT
Subject: Re: [PATCH] Introducing cg-xxdiff for conflict resolution
Message-ID: <46a038f90611021841p54c38d72x12360ec93f32a8ad@mail.gmail.com>
In-Reply-To: <20061103001135.GN20017@pasky.or.cz>

On 11/3/06, Petr Baudis <pasky@suse.cz> wrote:
> > Paski, did this one get dropped? Change of heart? Heart attack?
>
> Hmm, I thought we've agreed to go for the cg-resolve solution
> instead...?

Oops. That wasn't my reading. Misunderstood. In any case, if you go
back a bit in the conversation, the usage model I find this useful is
one where it makes sense to try different tools that have entirely
different parameters. That is why it makes sense to call them
differently.

So cg-meld [meld params] , is different from cg-xxdiff [xxdiff params]
and cg-wiggle [wiggle params] makes more sense to me and can be
maintained by different people (those who like meld probably dont' use
xxdiff ;-)

And from a packaging perspective, cg-resolve will depend on a zillion things.

cheers,