New merge tool system in mainline

[Giorgos Keramidas]

On 2008-02-03 20:04, Matt Mackall <mpm at selenic.com> 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.
> 
> To describe a new merge tool, do something like the following in hgrc:
> 
>  [merge-tools]
>  mymergetool.args=$local $other $base -o $output
[...]
> [merge-patterns]
> **.jpg = myimgmerge
> **.exe = internal:fail

Neat!  This will make mixed repo merging (i.e. one which contains binary
code drops from a thirdparty vendor *much* easier :)