# git-mergetool

2 messages from 2007-09-28 to 2007-09-29. Participants: Mattias Ulbrich, Junio C Hamano.
Thread: https://gitlist.dev/t/10058

## Mattias Ulbrich, 2007-09-28 08:56

Subject: git-mergetool
Message-ID: <200709281056.15844.mulbrich@ira.uka.de>
URL: https://gitlist.dev/e/200709281056.15844.mulbrich%40ira.uka.de

```

Hello everybody,

There might by a tiny typo-bug in the git-mergetool:

-----------
 case "$merge_tool" in
	kdiff3)
	    if base_present ; then
		(kdiff3 --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path (Remote)" 
\
		    -o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1)
	    else
		(kdiff3 --auto -L1 "$path (Local)" --L2 "$path (Remote)" \
		    -o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1)
	    fi
-----------

In the first call to kdiff3 the argument is only -L2 but should be --L2 (two 
minus signs) like in the second call - where -L1 misses its second "-".

Thank you for a very mighty set of tool

Sincerely

	Mattias

-- 
Mattias Ulbrich
Forschungsgruppe Prof. Dr. P.H. Schmitt
Institut für Theoretische Informatik
Universität Karlsruhe

```

## Junio C Hamano, 2007-09-29 09:27

Subject: Re: git-mergetool
Message-ID: <7vps01lt3t.fsf@gitster.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vps01lt3t.fsf%40gitster.siamese.dyndns.org
In-Reply-To: <200709281056.15844.mulbrich@ira.uka.de>

```
Thanks.

```