git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git merge with tkdiff fails (extra operand)

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Jan 28, 2008, 09:58 UTC
Message-ID
<fnk90t$gkq$1@ger.gmane.org>
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: Johannes Schindelin
Message 1 of 5 in “git merge with tkdiff fails (extra operand)”
  1. Sebastian SchuberthJan 28, 2008
  2. Johannes SchindelinJan 28, 2008
  3. Sebastian SchuberthJan 28, 2008
  4. Johannes SchindelinJan 28, 2008
  5. Sebastian SchuberthJan 28, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.