[PATCH 1 of 2] mergetools.hgrc: set vimdiff to check=changed

Benoit Boissinot bboissin at gmail.com
Fri Aug 31 16:22:39 CDT 2012


Pushed to crew, in stable, thanks.

(I'll let the other patch for someone else to comment)

On Fri, Aug 31, 2012 at 9:34 PM, Pierre-Yves David <
pierre-yves.david at ens-lyon.org> wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at logilab.fr>
> # Date 1343908309 -7200
> # Branch stable
> # Node ID 3b955dc3df50e296e19b244f85464f68121fb292
> # Parent  b0aad9fb87f947e821f0381d461f1794e73833a7
> mergetools.hgrc: set vimdiff to check=changed
>
> The standard reaction in from of unexpected vimdiff is to ":quit". This
> will
> make vimdiff return a 0 status even if no merge were done at all.
>
> This change detect that nothing have been changed in vimdiff as a potential
> unresolved conflict.
>
> diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
> --- a/contrib/mergetools.hgrc
> +++ b/contrib/mergetools.hgrc
> @@ -16,6 +16,7 @@
>  gvimdiff.priority=-9
>
>  vimdiff.args=$local $other $base
> +vimdiff.check=changed
>  vimdiff.priority=-10
>
>  merge.checkconflicts=True
> _______________________________________________
> 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/20120831/4b8572c2/attachment.html>


More information about the Mercurial-devel mailing list