From: Mattias Ulbrich <mulbrich@ira.uka.de>
To: git@vger.kernel.org
Subject: git-mergetool
Date: Fri, 28 Sep 2007 10:56:15 +0200 [thread overview]
Message-ID: <200709281056.15844.mulbrich@ira.uka.de> (raw)
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
next reply other threads:[~2007-09-28 9:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-28 8:56 Mattias Ulbrich [this message]
2007-09-29 9:27 ` git-mergetool Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200709281056.15844.mulbrich@ira.uka.de \
--to=mulbrich@ira.uka.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).