From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Subject: git merge with tkdiff fails (extra operand)
Date: Mon, 28 Jan 2008 10:58:53 +0100 [thread overview]
Message-ID: <fnk90t$gkq$1@ger.gmane.org> (raw)
Hi,
I'm running Git 1.5.3.7 under SuSE 10.0. After pulling and getting a
merge conflict, "git mergetool" by default is configured to run tkdiff.
Unfortunately, tkdiff starts with an error:
diff failed:
diff: extra operand
`Amira/QxViewer.cpp.REMOTE.28414`
diff: Try diff --help for more information.
I'm not sure whether the error is with the tkdiff integration into Git,
or with tkdiff itself (as it refers to the help for "diff").
Any insights?
--
Sebastian Schuberth
next reply other threads:[~2008-01-28 9:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-28 9:58 Sebastian Schuberth [this message]
2008-01-28 13:13 ` git merge with tkdiff fails (extra operand) Johannes Schindelin
2008-01-28 14:05 ` Sebastian Schuberth
2008-01-28 14:24 ` Johannes Schindelin
2008-01-28 14:37 ` Sebastian Schuberth
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='fnk90t$gkq$1@ger.gmane.org' \
--to=sschuberth@gmail.com \
--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).