[OT] add meld support to hgmerge

[Matt Mackall]

On Sat, Jan 28, 2006 at 11:35:39AM +0100, Radoslaw Szkodzinski wrote:
> Bryan O'Sullivan wrote:
> > On Fri, 2006-01-27 at 11:23 -0800, malahal at us.ibm.com wrote:
> >> Hi, we use a different SCM at work that doesn't have 'merge' feature.
> >> It requires manual merge for non-conflicting files! I am planning on
> >> using mercurial to do merges for me. Does the following approach work?
> >> Is there any better way of doing the same?
> > 
> > This doesn't make any obvious sense.  Why not write some scripts that
> > run something like kdiff3 instead?  It will be much less cumbersome.
> > 
> > 	<b
> 
> I've had much better results with meld for visual merging.
> The only problem is it doesn't exit with any meaningful return code.
> But you can always compare $LOCAL.orig with $LOCAL and bail out if
> they're identical
> 
> I think it should be added to default hgmerge.

Fine by me, can you send a patch? Make it lower priority than the
existing ones so you don't surprise anyone (like me) who has both
kdiff3 and meld installed.

-- 
Mathematics is the supreme nostalgia of our time.