Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Setup p4merge as mergetool and difftool for git in windows (found here: http://stackoverflow.com/questions/426026/git-on-windows-how-do-you-set-up-a-mergetool)
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"'
git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd 'p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"'
@adamveld12
Copy link

adamveld12 commented Jul 14, 2015

I had a 'path/to/my/file is (or point to) an invalid file' error. According to the solution I found, I guess the quotes mess things up.
http://stackoverflow.com/questions/866262/p4merge-error-git

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment