Re: [RFC PATCH 2/3] mergetools/kdiff3: allow opting-out of auto-merges

John Keeping [off-list ref] writes:

On Thu, May 09, 2013 at 09:10:51AM -0700, Junio C Hamano wrote:

quoted

David Aguilar [off-list ref] writes:

quoted

Marked "RFC" because I am kinda against adding more configuration
variables.

Just like "git merge" has -X<option> escape hatch to allow us to
pass backend-specific options, perhaps you can add a mechanism to
"git mergetool" to let the user pass --no-auto from the command
line?

We already have "mergetool.<tool>.cmd" which allows a completely custom
command line to be specified.

Then probably it is a good idea to drop this patch and replace it
with a documentation patch to suggest those who do not want --auto
to use that mechanism?