--- a/contrib/mergetools.hgrc Tue Sep 04 13:49:39 2012 -0700 +++ b/contrib/mergetools.hgrc Tue Sep 04 13:50:22 2012 -0700 @@ -16,6 +16,7 @@ gvimdiff.priority=-9 vimdiff.args=$local $other $base +vimdiff.check=changed vimdiff.priority=-10 merge.checkconflicts=True