[PATCH] mergetools.hgrc: add minimal configuration for editmerge

[Mads Kiilerich]

On 05/29/2014 09:27 PM, pierre-yves.david at ens-lyon.org wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at fb.com>
> # Date 1401391525 25200
> #      Thu May 29 12:25:25 2014 -0700
> # Node ID deb6b5713557f9c3f2e6320e87b11c108d4aafec
> # Parent  7c5a85619dca0fb0af0b9ad6fd1dc3147b2da0dd
> mergetools.hgrc: add minimal configuration for editmerge
>
> The ``editmerge`` script is shipped in contrib and open an editor on every
> conflicting file. It needs minimal configuration to inject the config marker in
> the file before opening. Otherwise it behaves the same as ``internal:local`` and
> bad things happen.
>
> diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
> --- a/contrib/mergetools.hgrc
> +++ b/contrib/mergetools.hgrc
> @@ -69,10 +69,16 @@ ecmerge.args=$base $local $other --mode=
>   ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
>   ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
>   ecmerge.gui=True
>   ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
>   
> +# editmerge is a small script shipped in contrib.
> +# It need this config otherwise it behave the same as internal:local

needs
behaves

> +editmerge.args=$output
> +editmerge.check=changed
> +editmerge.premerge=keep

Shouldn't it also have a (unique) priority?

The actual priority would probably be the subject of some bikeshedding, 
but it is better to have the discussion and make a choice than letting 
it "randomly" pick among other tools with same priority.

/Mads