Mercurial > hg

changeset 17438:7a6ab3a802c5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Bryan O'Sullivan <bryano@fb.com>
date Tue, 04 Sep 2012 13:50:22 -0700
parents b6fab957b27d (current diff) 63e9b0732518 (diff)
children fbb732a8f2b9 b9698f19b929
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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