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. But when I use git difftool command in git bash, I expect p4merge but I see internal implementation of diff in git. So remove other stuff like difftool.path and all that.
#Set p4merge as git mergetool but 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. So you only need to modify your global git config (/. When type of conflict is removed file conflict, git difftool command opens p4merge. A while ago this took more effort as described in this link (scroll to section ‘External Merge and Diff Tools’). I tried Smooth Git + P4merge but it does not work for me also I tried to do as described in External Merge and Diff Tools but I did not understand that. But when I use git difftool command in git bash, I expect p4merge but I see internal implementation of diff in git bash. =C:/Program Files/Perforce/p4merge.exeĭ=C:/Program Files/Perforce/p4merge.exe In my research I came across this helpful Gist by Shawn Dumas. Git config -global "C:/Program Files/Perforce/p4merge.exe"Īnd these lines are from git config: merge.tool=p4merge Configure Winmerge as Git Mergetool on Windows Today I wanted to set up WinMerge as default mergetool for Git.
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.
0 kommentar(er)
