# git mergetool ignores configured command line

4 messages from 2011-10-23 to 2011-10-23. Participants: Alexander Vladimirov, Andreas Schwab, Junio C Hamano, David Aguilar.
Thread: https://gitlist.dev/t/28750

## Alexander Vladimirov, 2011-10-23 04:43

Subject: git mergetool ignores configured command line
Message-ID: <CAARCrw6D7CKy2Jn43zUZ3EefyqdY6Tk4A39ZQ74H6hySA5eCBQ@mail.gmail.com>
URL: https://gitlist.dev/e/CAARCrw6D7CKy2Jn43zUZ3EefyqdY6Tk4A39ZQ74H6hySA5eCBQ%40mail.gmail.com

```
To configure diffuse as merge tool I set mergetool configuration using
following commands:

git config --global merge.tool diffuse
git config --global mergetool.diffuse.cmd '/usr/bin/diffuse "$LOCAL"
"$MERGED" "$REMOTE"'

Then, when I invoke mergetool during merge, I get diffuse with four
panes open as by default, instead of three specified in command line
setting.
Is this an expected behavior, and how can I force mergetool to use
provided command line?

```

## Andreas Schwab, 2011-10-23 08:37

Subject: Re: git mergetool ignores configured command line
Message-ID: <m21uu4hzmq.fsf@linux-m68k.org>
URL: https://gitlist.dev/e/m21uu4hzmq.fsf%40linux-m68k.org
In-Reply-To: <CAARCrw6D7CKy2Jn43zUZ3EefyqdY6Tk4A39ZQ74H6hySA5eCBQ@mail.gmail.com>

```
Alexander Vladimirov <alexander.idkfa.vladimirov@gmail.com> writes:

> To configure diffuse as merge tool I set mergetool configuration using
> following commands:
>
> git config --global merge.tool diffuse
> git config --global mergetool.diffuse.cmd '/usr/bin/diffuse "$LOCAL"
> "$MERGED" "$REMOTE"'
>
> Then, when I invoke mergetool during merge, I get diffuse with four
> panes open as by default, instead of three specified in command line
> setting.
> Is this an expected behavior, and how can I force mergetool to use
> provided command line?

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

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

```

## Junio C Hamano, 2011-10-23 09:52

Subject: Re: git mergetool ignores configured command line
Message-ID: <7vaa8s592k.fsf@alter.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vaa8s592k.fsf%40alter.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?

```

## David Aguilar, 2011-10-23 10:35

Subject: Re: git mergetool ignores configured command line
Message-ID: <20111023103459.GA29816@gmail.com>
URL: https://gitlist.dev/e/20111023103459.GA29816%40gmail.com
In-Reply-To: <7vaa8s592k.fsf@alter.siamese.dyndns.org>

```
On Sun, Oct 23, 2011 at 02:52:19AM -0700, Junio C Hamano wrote:
> 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?

I agree.  Ideally, we should honor their configuration.
I'll see if doing so is not too intrusive.
-- 
					David

```