I use windows 7. I want to use p4merge as Git diff/merge tool. I follow this article and this one to setup and config p4merge:
windows 7
p4merge
<
Better late than never :)
mergetool.p4merge.path should be mergetool.p4merge.cmd
Change path to cmd for both the mergetool and difftool lines.