New merge tool system in mainline

[Adrian Buehlmann]

On 04.02.2008 03:04, Matt Mackall wrote:
> I've introduced a powerful new merge tool scheme to mainline, heavily
> inspired by Steve and Arve's work for TortoiseHG (thanks, guys!). The
> basic idea is to make setting up a merge tool as simple as possible.

Just for reference:

I created a new stub page on the wiki at:
http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration

Per Steve, the page:
http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram
probably should be updated (possibly as soon as this new feature is released, IMHO).