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

[Matt Mackall]

On Mon, 2008-10-06 at 15:01 +0200, Mads Kiilerich wrote:
> # 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.

Not convinced on this one. kdiff3 --auto will sometimes merge things
that plain old merge won't. This has been the default behavior for
kdiff3 with the old hgmerge script for years now.

-- 
Mathematics is the supreme nostalgia of our time.