#P4merge unity windows#

Git config -global 'C:/Program Files/Perforce/p4merge.exe'Īnd these lines are from git config: merge.tool=p4merge Git config -global 'C:/Program Files/Perforce/p4merge.exe' I follow this article and this one to setup and config p4merge: git config -global merge.tool p4merge I want to use p4merge as Git diff/merge tool. should be Ĭhange path to cmd for both the mergetool and difftool lines. So if the above description doesn't work for you chances the problem lies somewhere else. However I tried creating an empty repo somewhere on my drive with git init, add a file, commit it, then modify it, then I tried difftool and it worked. I'm not sure what was the problem in that repo. Note: I had a repository in which even if I did issue the git difftool or git mergetool commands P4Merge wouldn't start. Then just use git difftool or git mergetool to your hearts content. So remove other stuff like difftool.path and all that.

#P4merge unity windows#

If p4merge is in this list then you just need to add the path where p4merge.exe resides to your %PATH% (on Windows I recommend Rapid Environment Editor for this).Īfter this is done you just need the following config to be in your. It'll list the available tools Git can use (because they've found them in your %PATH%) and the tools it could use (if they were installed). You can tell if this is the case or not by running git difftool -tool-help. Not sure if helps, but recent versions of Git support P4Merge (I use git version 2.17.0.