Re: [PATCH] Introducing cg-xxdiff for conflict resolution

On 11/3/06, Petr Baudis [off-list ref] wrote:

quoted

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,