Mercurial > public > mercurial-scm > hg

diff contrib/mergetools.hgrc @ 6011:15a53af36a89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: two fixes for kdiff3 example configuration
author Steve Borho <steve@borho.org>
date Sun, 03 Feb 2008 22:27:53 -0600
parents 33bfedc0be4a
children 2f424fc4edb3
line wrap: on
line diff
--- a/contrib/mergetools.hgrc	Thu Jan 31 22:32:11 2008 -0600
+++ b/contrib/mergetools.hgrc	Sun Feb 03 22:27:53 2008 -0600
@@ -3,7 +3,8 @@
 [merge-tools]
 kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
 kdiff3.regkey=Software\KDiff3
-kdiff3.append=\kdiff3.exe
+kdiff3.regappend=\kdiff3.exe
+kdiff3.fixeol=True
 kdiff3.gui=True
 
 gvimdiff.args=--nofork -d -g -O $local $other $base