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
