[PATCH 5 of 6] Change mergetools.rc so kdiff3 isn't called with --auto option

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1221678328 -7200
# Node ID daa237db419ccf4f75bc541c7b019d2bba8cdf8b
# Parent  6705a291b078fe07f4edf187d84d64e2f05d59e2
Change mergetools.rc so kdiff3 isn't called with --auto option
kdiff3.args in the sample mergetools.rc used "--auto" which does (more or less)
the same as "premerge". Disabling premerge thus had no effect.

I think this is a part of the right solution to issue1295.

diff -r 6705a291b078 -r daa237db419c contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Wed Sep 17 21:02:16 2008 +0200
+++ b/contrib/mergetools.hgrc	Wed Sep 17 21:05:28 2008 +0200
@@ -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=--L1 base --L2 local --L3 other $base $local $other -o $output
 kdiff3.regkey=Software\KDiff3
 kdiff3.regappend=\kdiff3.exe
 kdiff3.fixeol=True