{"thread":{"id":"11769","subject":"git merge with tkdiff fails (extra operand)","startedAt":"2008-01-28T09:58:53Z","lastAt":"2008-01-28T14:37:23Z","messageCount":5,"participants":["Sebastian Schuberth","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"66729","messageId":"fnk90t$gkq$1@ger.gmane.org","threadId":"11769","inReplyTo":null,"subject":"git merge with tkdiff fails (extra operand)","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2008-01-28T09:58:53Z","receivedAt":"2008-01-28T09:58:53Z","isPatch":false,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Hi,\n\nI'm running Git 1.5.3.7 under SuSE 10.0. After pulling and getting a \nmerge conflict, \"git mergetool\" by default is configured to run tkdiff. \nUnfortunately, tkdiff starts with an error:\n\ndiff failed:\ndiff: extra operand\n`Amira/QxViewer.cpp.REMOTE.28414`\ndiff: Try diff --help for more information.\n\nI'm not sure whether the error is with the tkdiff integration into Git, \nor with tkdiff itself (as it refers to the help for \"diff\").\n\nAny insights?\n\n-- \nSebastian Schuberth\n"},{"id":"66745","messageId":"alpine.LSU.1.00.0801281309240.23907@racer.site","threadId":"11769","inReplyTo":"fnk90t$gkq$1@ger.gmane.org","subject":"Re: git merge with tkdiff fails (extra operand)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-01-28T13:13:17Z","receivedAt":"2008-01-28T13:13:17Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 28 Jan 2008, Sebastian Schuberth wrote:\n\n> I'm running Git 1.5.3.7 under SuSE 10.0. After pulling and getting a \n> merge conflict, \"git mergetool\" by default is configured to run tkdiff. \n> Unfortunately, tkdiff starts with an error:\n> \n> diff failed:\n> diff: extra operand\n> `Amira/QxViewer.cpp.REMOTE.28414`\n> diff: Try diff --help for more information.\n> \n> I'm not sure whether the error is with the tkdiff integration into Git, \n> or with tkdiff itself (as it refers to the help for \"diff\").\n\nIt seems that tkdiff calls diff with arguments that diff does not like.  \nWhat version of tkdiff do you use?\n\nCiao,\nDscho\n\nP.S.: to make sure that it is tkdiff, I would search for this line in \ntkdiff:\n\n\tset g(debug) f\n\nand change the \"f\" to \"t\".\n"},{"id":"66746","messageId":"bdca99240801280605i55f3df00na0eea23488d26e17@mail.gmail.com","threadId":"11769","inReplyTo":"alpine.LSU.1.00.0801281309240.23907@racer.site","subject":"Re: git merge with tkdiff fails (extra operand)","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2008-01-28T14:05:12Z","receivedAt":"2008-01-28T14:05:12Z","isPatch":false,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"> > I'm running Git 1.5.3.7 under SuSE 10.0. After pulling and getting a\n> > merge conflict, \"git mergetool\" by default is configured to run tkdiff.\n> > Unfortunately, tkdiff starts with an error:\n> >\n> > diff failed:\n> > diff: extra operand\n> > `Amira/QxViewer.cpp.REMOTE.28414`\n> > diff: Try diff --help for more information.\n> >\n> > I'm not sure whether the error is with the tkdiff integration into Git,\n> > or with tkdiff itself (as it refers to the help for \"diff\").\n>\n> It seems that tkdiff calls diff with arguments that diff does not like.\n> What version of tkdiff do you use?\n\nI'm running TkDiff 4.0.2 (and \"diff (GNU diffutils) 2.8.7\").\n\n> P.S.: to make sure that it is tkdiff, I would search for this line in\n> tkdiff:\n>\n>         set g(debug) f\n>\n> and change the \"f\" to \"t\".\n\nI cannot find this line in my version of tkdiff ... in fact, the\nstring \"debug\" does not occur anywhere in the file.\n\n-- \nSebastian Schuberth\n"},{"id":"66747","messageId":"alpine.LSU.1.00.0801281423390.23907@racer.site","threadId":"11769","inReplyTo":"bdca99240801280605i55f3df00na0eea23488d26e17@mail.gmail.com","subject":"Re: git merge with tkdiff fails (extra operand)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-01-28T14:24:56Z","receivedAt":"2008-01-28T14:24:56Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 28 Jan 2008, Sebastian Schuberth wrote:\n\n> > > I'm running Git 1.5.3.7 under SuSE 10.0. After pulling and getting a\n> > > merge conflict, \"git mergetool\" by default is configured to run tkdiff.\n> > > Unfortunately, tkdiff starts with an error:\n> > >\n> > > diff failed:\n> > > diff: extra operand\n> > > `Amira/QxViewer.cpp.REMOTE.28414`\n> > > diff: Try diff --help for more information.\n> > >\n> > > I'm not sure whether the error is with the tkdiff integration into Git,\n> > > or with tkdiff itself (as it refers to the help for \"diff\").\n> >\n> > It seems that tkdiff calls diff with arguments that diff does not like.\n> > What version of tkdiff do you use?\n> \n> I'm running TkDiff 4.0.2 (and \"diff (GNU diffutils) 2.8.7\").\n> \n> > P.S.: to make sure that it is tkdiff, I would search for this line in\n> > tkdiff:\n> >\n> >         set g(debug) f\n> >\n> > and change the \"f\" to \"t\".\n> \n> I cannot find this line in my version of tkdiff ... in fact, the\n> string \"debug\" does not occur anywhere in the file.\n\nAh, I was looking at the latest and greatest: 4.1.3.  You can, too:\n\nhttp://tkdiff.cvs.sourceforge.net/tkdiff/src/tkdiff?revision=1.48&view=markup\n\nHth,\nDscho\n"},{"id":"66748","messageId":"bdca99240801280637s1e90f182tc02026501c23a4da@mail.gmail.com","threadId":"11769","inReplyTo":"alpine.LSU.1.00.0801281423390.23907@racer.site","subject":"Re: git merge with tkdiff fails (extra operand)","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2008-01-28T14:37:23Z","receivedAt":"2008-01-28T14:37:23Z","isPatch":false,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"> > > It seems that tkdiff calls diff with arguments that diff does not like.\n> > > What version of tkdiff do you use?\n> >\n> > I'm running TkDiff 4.0.2 (and \"diff (GNU diffutils) 2.8.7\").\n> >\n> > > P.S.: to make sure that it is tkdiff, I would search for this line in\n> > > tkdiff:\n> > >\n> > >         set g(debug) f\n> > >\n> > > and change the \"f\" to \"t\".\n> >\n> > I cannot find this line in my version of tkdiff ... in fact, the\n> > string \"debug\" does not occur anywhere in the file.\n>\n> Ah, I was looking at the latest and greatest: 4.1.3.  You can, too:\n>\n> http://tkdiff.cvs.sourceforge.net/tkdiff/src/tkdiff?revision=1.48&view=markup\n\nThanks, with that version it works for me (the link actually downloads\nversion 4.1.4 currently). Maybe the minimum version of TkDiff should\nbe listed as a prerequisite, or \"git mergetool\" should be enhanced to\nsupport older versions, too.\n\n-- \nSebastian Schuberth\n"}]}