Home » Mailing list archives » git » 2008 » January » 28

git merge with tkdiff fails (extra operand)

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Sebastian Schuberth
Subject: git merge with tkdiff fails (extra operand)
Date: Monday, January 28, 2008 - 2:58 am

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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
git merge with tkdiff fails (extra operand), Sebastian Schuberth, (Mon Jan 28, 2:58 am)
Re: git merge with tkdiff fails (extra operand), Johannes Schindelin, (Mon Jan 28, 6:13 am)
Re: git merge with tkdiff fails (extra operand), Sebastian Schuberth, (Mon Jan 28, 7:05 am)
Re: git merge with tkdiff fails (extra operand), Johannes Schindelin, (Mon Jan 28, 7:24 am)
Re: git merge with tkdiff fails (extra operand), Sebastian Schuberth, (Mon Jan 28, 7:37 am)