[PATCH] filemerge: two fixes for kdiff3 example configuration

Steve Borho steve at borho.org
Sun Feb 3 22:28:29 CST 2008


# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1202099273 21600
# Node ID 15a53af36a89126d961589c27a078b579dbae840
# Parent  83d193a513c80dfad63c5c7f8a26fa52f902caa9
filemerge: two fixes for kdiff3 example configuration

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -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


More information about the Mercurial-devel mailing list