From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Oct 2011 09:52:19 GMT
Subject: Re: git mergetool ignores configured command line
Message-ID: <7vaa8s592k.fsf@alter.siamese.dyndns.org>
In-Reply-To: <m21uu4hzmq.fsf@linux-m68k.org>

Andreas Schwab <schwab@linux-m68k.org> writes:

> diffuse is already a predefined merge tool, so mergetool.diffuse.cmd is
> ignored.  Try using a different name.

I wonder if we can improve this, though.

It is nice that we give canned definition of argument order to so many
obscure tools, but instead of ignoring mergetool.<tool>.cmd when the user
told us to use <tool>, couldn't we simply ignore what we have internally
as canned definition?

Even if such a change were too intrusive (I didn't check), could we have
a decency to at least warn that we are ignoring the configuration?