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

[pierre-yves.david at logilab.fr]

# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1343908309 -7200
# Branch stable
# Node ID 192441ab174c489bd7bbc61d8bd0e4658f79aeaf
# Parent  e15765c18ebc18448addb955d2b698c75fc8b380
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
@@ -14,10 +14,11 @@ gvimdiff.regkey=Software\Vim\GVim
 gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
 gvimdiff.regname=path
 gvimdiff.priority=-9
 
 vimdiff.args=$local $other $base
+vimdiff.check=changed
 vimdiff.priority=-10
 
 merge.checkconflicts=True
 merge.priority=-100