Mercurial > public > mercurial-scm > hg-stable

diff contrib/mergetools.hgrc @ 17422:93bc65e970c0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 02 Aug 2012 13:51:49 +0200
parents a87a0fcb412f
children bafbfe0b450c
line wrap: on
line diff
--- a/contrib/mergetools.hgrc	Wed Aug 29 02:09:43 2012 +0200
+++ b/contrib/mergetools.hgrc	Thu Aug 02 13:51:49 2012 +0200
@@ -16,6 +16,7 @@
 gvimdiff.priority=-9
 
 vimdiff.args=$local $other $base
+vimdiff.check=changed
 vimdiff.priority=-10
 
 merge.checkconflicts=True