* git-mergetool
@ 2007-09-28 8:56 Mattias Ulbrich
2007-09-29 9:27 ` git-mergetool Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Mattias Ulbrich @ 2007-09-28 8:56 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-09-29 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-28 8:56 git-mergetool Mattias Ulbrich
2007-09-29 9:27 ` git-mergetool Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).