Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge stable
authorBryan O'Sullivan <bryano@fb.com>
Tue, 04 Sep 2012 13:50:22 -0700
branchstable
changeset 17438 7a6ab3a802c5
parent 17437 b6fab957b27d (current diff)
parent 17423 63e9b0732518 (diff)
child 17439 fbb732a8f2b9
child 17442 b9698f19b929
Merge
--- 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
mercurial