[PATCH STABLE] mergetools: vimdiff issue a warning explaining how to abort

Benoit Boissinot bboissin at gmail.com
Fri Feb 15 06:21:44 CST 2013


Looks good.


On Fri, Feb 15, 2013 at 12:31 PM, <pierre-yves.david at logilab.fr> wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at logilab.fr>
> # Date 1360924084 -3600
> # Branch stable
> # Node ID cabb74a6dc7a98b63f7ea51b5b87fb613a8be940
> # Parent  f6f35d646cb5919997d3a23b942594def5d9e243
> mergetools: vimdiff issue a warning explaining how to abort
>
> Adds a message displayed at each vimdiff invocation:
>
>   merge conflict detected, type ":cq" to abort
>
> Vimdiff is very confusing for non-vim user (not to speak about vim user
> confused
> anyway. However it is very likely that vimdiff is picked as the mergetool
> of
> choice when using the default config:
> - vim is available on all UNIX system.
> - Its one of the rare non graphical merge tools.
>
> diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
> --- a/contrib/mergetools.hgrc
> +++ b/contrib/mergetools.hgrc
> @@ -13,11 +13,11 @@ gvimdiff.args=--nofork -d -g -O $local $
>  gvimdiff.regkey=Software\Vim\GVim
>  gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
>  gvimdiff.regname=path
>  gvimdiff.priority=-9
>
> -vimdiff.args=$local $other $base
> +vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge
> conflict detected, type \":cq\" to abort" | echohl'
>  vimdiff.check=changed
>  vimdiff.priority=-10
>
>  merge.check=conflicts
>  merge.priority=-100
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130215/69047c0b/attachment.html>


More information about the Mercurial-devel mailing list