threads / discuss / 10058

git-mergetool

Subject: git-mergetool

## tl;dr

2 messages between Sep 28, 2007 and Sep 29, 2007.

replies: 1people: 2as markdown or json

Mattias Ulbrich· Sep 28, 2007, 08:56 UTC · lore
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

← back to recent threads