# HG changeset patch
# User Neal Becker <ndbecker2@gmail.com>
# Date 2008-04-16 22:26:37
# Node ID 90ec0e8fa4d0381ab6cfd13bbe353538b2e98fbc
# Parent  3182602fa1fbb6b8064f291a283d415afec8d9ca

mergetools.hgrc patch

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -1,7 +1,7 @@
 # Some default global settings for common merge tools
 
 [merge-tools]
-kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
+kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
 kdiff3.regkey=Software\KDiff3
 kdiff3.regappend=\kdiff3.exe
 kdiff3.fixeol=True