Mercurial > hg

diff contrib/mergetools.hgrc @ 6075:63e0e57ab157

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add 'checkchanged' merge tool property
author Steve Borho <steve@borho.org>
date Wed, 06 Feb 2008 20:32:06 -0600
parents 2f424fc4edb3
children 8b67211d9140
line wrap: on
line diff
--- a/contrib/mergetools.hgrc	Mon Feb 11 16:13:43 2008 -0600
+++ b/contrib/mergetools.hgrc	Wed Feb 06 20:32:06 2008 -0600
@@ -28,6 +28,7 @@
 xxdiff.priority=-8
 
 diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
+diffmerge.checkchanged=True
 diffmerge.gui=True
 
 p4merge.args=$base $local $other $output