Re: git merge with tkdiff fails (extra operand)

From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Jan 28, 2008, 14:37 UTC
Message-ID: <bdca99240801280637s1e90f182tc02026501c23a4da@mail.gmail.com>
In-Reply-To: <alpine.LSU.1.00.0801281423390.23907@racer.site>

Show 18 quoted lines

> > > 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

Thanks, with that version it works for me (the link actually downloads version 4.1.4 currently). Maybe the minimum version of TkDiff should be listed as a prerequisite, or "git mergetool" should be enhanced to support older versions, too.

-- 
Sebastian Schuberth