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? > > I'm running TkDiff 4.0.2 (and "diff (GNU diffutils) 2.8.7"). > > > 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". > > I cannot find this line in my version of tkdiff ... in fact, the > string "debug" does not occur anywhere in the file. Ah, I was looking at the latest and greatest: 4.1.3. You can, too: http://tkdiff.cvs.sourceforge.net/tkdiff/src/tkdiff?revision=1.48&view=markup Hth, Dscho - 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
