[PATCH 5 of 5] Change mergetools.rc to not use kdiff3 --auto option

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1223296885 -7200
# Node ID 6d73ada3299b2c27d8a4b39b76c5a5d5bf458c13
# Parent  be0868d7566c0323d92305e8b01fff43c6f7ce8a
Change mergetools.rc to not use kdiff3 --auto option

Mercurial has the premerge setting which can be set to false to disable
automatic silent merge.

kdiff3.args in the sample mergetools.rc used "--auto" which does (more or less)
the same as "premerge", so the premerge setting was effectively overruled.

This is related to issue1295.

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=--L1 base --L2 local --L3 other $base $local $other -o $output
 kdiff3.regkey=Software\KDiff3
 kdiff3.regappend=\kdiff3.exe
 kdiff3.fixeol=True