# HG changeset patch
# User Neal Becker <ndbecker2@gmail.com>
# Date 1208384797 25200
# Node ID 8b67211d91404f64ea5061929e2cf14c53f8dc1e
# Parent  550c53d6694947b3ab205c93933d5dabca61c8ad
mergetools.hgrc patch

diff -r 550c53d66949 -r 8b67211d9140 contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Wed Apr 16 16:07:15 2008 +0200
+++ b/contrib/mergetools.hgrc	Wed Apr 16 15:26:37 2008 -0700
@@ -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