configuración de la herramienta P4Merge
$ git config --global diff.tool p4merge
$ git config --global difftool.p4merge.path 'C:\Program Files\Perforce\p4merge.exe'
Gleaming Goshawk