Gvimdiff mergetool for msysgit

Question

I am trying to use gvimdiff as a mergetool for git on windows. I used to use vimdiff in console mode, but I know that I do not like to limit the size of the Windows console, so I'm trying to switch to gvimdiff, which have a more flexible approach to adjust the size of the window.

But trying to call git mergetool , now I get an error that is not clear to me:

The merge tool gvimdiff is not available as 'gvim'

How can this be solved?

gvim for Windows is installed and accessible through the command line. The same is true for the gvimdiff .

I am trying to find a place where this error occurs in git scripts, but currently with no luck.

Answer 1

If you run the Git console, are you sure the commands are available? I suspect that this is not on the PATH your Git console, but only on the Windows PATH (which is not fully enabled).

Answer 2

Combining your answers, these are my settings

.gitconfig

 [alias] d = difftool [diff] renames = copy tool = gvimdiff [difftool "gvimdiff"] cmd = "gvim -d" "$LOCAL" "$REMOTE" [difftool] prompt = false 

And added the gvim file, available in %PATH% with content:

 "C:\Program Files (x86)\Vim\vim73\gvim.exe" "$@" 

Git diffftool on Windows to see a list of all modified files in addition to diff (a la Kaleidoscope)