I think that was me transposing incorrectly into the email - I used
the git-config with path and checked my local .gitconfig in Home which
contains:
[mergetool "kdiff3"]
path = C:\\utils\\KDiff3-0.9.92\\KDiff3\\KDiff3.exe
[merge]
tool = kdiff3
2008/4/23 Lee Henson <[EMAIL PROTECTED]>:
> > git config option merge.tool set to unknown tool:
> C:\utils\KDiff3-0.9.92\kdiff3.exe
>
> That looks like you've tried to set:
>
> git-config merge.tool C:\utils\KDiff3-0.9.92\kdiff3.exe
>
> rather than
>
> git-config mergetool kdiff3
> git-config mergetool.kdiff3.path C:\utils\KDiff3-0.9.92\kdiff3.exe
>
>
>
> On 23/04/2008, Darren Syzling <[EMAIL PROTECTED]> wrote:
> > Hmm, may be I'll update to the latest. Trying to configure the diff
> > tool using git-config I just get:
> >
> > git config option merge.tool set to unknown tool:
> C:\utils\KDiff3-0.9.92\kdiff3.
> > exe
> > Resetting to default...
> > merge tool candidates: opendiff emerge vimdiff
> > No known merge resolution program available.
> >
> > When I specify on the command line directly with --tool=kdiff3 then I
> > get the prompt, choose to ignore and kdiff3 doesn't appear, it then
> > moves onto the next file.
> >
> > 2008/4/23 Lee Henson <[EMAIL PROTECTED]>:
> >
> > > Yeah I am using KDiff3 here fine with the latest msysgit installer. All
> I
> > > have done is:
> > >
> > > -----------
> > > git-config --global merge.tool kdiff3
> > > git-config --global mergetoo.kdiff3.path "C:\Program
> > > Files\KDiff3\KDiff3.exe"
> > > -----------
> > > After a merge with conflicts: git-mergetool
> > > -----------
> > > blah blah blah
> > >
> > > Hit return to start merge resolution tool (kdiff3):
> > > hit enter
> > > -----------
> > > a window appears saying unknown option blah blah
> > > hit enter to ignore
> > > -----------
> > > kdiff3 opens fine
> > > I correct the diff and then save and close
> > >
> > >
> > >
> > >
> > >
> > > On 23/04/2008, Darren Syzling <[EMAIL PROTECTED]> wrote:
> > > >
> > > > Has anyone had any success using git mergetool with kdiff3 or
> gvimdiff?
> > > >
> > > > I'm using the 1.5.4 preview - Git-1.5.4-preview20080202.exe. I've
> > > > merged a branch with conflicts, added kdiff3 to my path and then used:
> > > >
> > > > git mergetool --tool=kdiff3
> > > >
> > > > The merge detects conflicts and prompts for me to run the interactive
> > > > kdiff3 merge tool:
> > > >
> > > > Merging the files: <filename1>
> > > > <other files here>
> > > >
> > > > Normal merge conflict for <file>
> > > > {local}: modified
> > > > {remote}: modified
> > > > Hit return to start merge resolution tool (kdiff3):
> > > >
> > > > I then hit return and kdiff3 complains with 'unknown option --' and
> > > > then the usage window. Just wondered if anyone else had any luck or
> > > > am I doing something wrong?
> > > >
> > > > I also tried with my windows based (non cygwin) installaton of gvim -
> > > > with gvim in the path - using --gvimdiff and this refused with:
> > > > gvimdiff not available as 'gvimdiff'
> > > >
> > > >
> > > >
> > > > Darren
> > > >
> > >
> > >
> >
> >
> >
> >
> > --
> >
> > Darren
> >
>
>
--
Darren
