gvimdiff mergetool for msysgit

Question

I'm trying to use gvimdiff as a mergetool for git on Windows. Previously I've used vimdiff in console mode, but know feel like I'm not happy with limiting view Windows console size, so I'm trying to switch to gvimdiff which have more flexible approach to setting window size.

But trying to call git mergetool now I'm receiving error which is not clear for me:

The merge tool gvimdiff is not available as 'gvim'

How this could be resolved?

gvim for Windows is install and accessible via command line. The same is true for gvimdiff command.

I'm trying to find the place where this error is raised in git scripts, but currently with no luck.

Answer 1

If you start a Git console, are you sure the commands are accessible? I'm suspecting that it is not on the PATH of your Git console, only the Windows PATH (which is not entirely included).

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 file gvim accessible in %PATH% with content:

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

Git difftool in Windows to see list of all changed files in addition to file diffs (a la Kaleidoscope)?