git-mergetool

From: Mattias Ulbrich <hidden>
Date: 2016-06-15 22:43:37

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help