Setting up p4merge
as diff and merge tool on Windows. Tried for Git version
Two alternatives are explained: using the command line, and directly editing the config file.
Setting up from the command line
Being the installation path
"C:Program Files\Perforce\p4merge.exe", just run:
$ git config --global diff.tool p4merge