mergetools.hgrc patch

[Matt Mackall]

On Wed, 2008-04-16 at 08:37 -0400, Neal Becker wrote:
> --- contrib/mergetools.hgrc.orig        2008-03-24 19:05:20.000000000 -0400
> +++ contrib/mergetools.hgrc     2008-04-15 15:27:46.000000000 -0400
> @@ -1,11 +1,12 @@
>  # Some default global settings for common merge tools
>  
>  [merge-tools]
> -kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
> +kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output

That looks fine.

>  kdiff3.regkey=Software\KDiff3
>  kdiff3.regappend=\kdiff3.exe
>  kdiff3.fixeol=True
>  kdiff3.gui=True
> +kdiff3.priority=1

But that doesn't. I'm basically assuming that "modern 3-way merge tools"
like kdiff3, meld, etc. are all reasonable choices and using any one of
them is fine. We only bump priority down for the less able/friendly
tools and never bump anything up past zero.
 
Queuing the first chunk.

-- 
Mathematics is the supreme nostalgia of our time.