Hi, On Mon, 28 Jan 2008, Sebastian Schuberth wrote: > 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"). It seems that tkdiff calls diff with arguments that diff does not like. What version of tkdiff do you use? Ciao, Dscho P.S.: to make sure that it is tkdiff, I would search for this line in tkdiff: set g(debug) f and change the "f" to "t". - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
