# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1346791822 25200
# Node ID 7a6ab3a802c535e2c783f1c2c9da2195aa89f35d
# Parent  b6fab957b27d2bac48913d27881787a2877f76b5# Parent  63e9b0732518abb71a1be8923fe5ef82fe02635d
Merge

diff -r b6fab957b27d -r 7a6ab3a802c5 contrib/mergetools.hgrc
--- 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