Skip to content

Instantly share code, notes, and snippets.

@daredude

daredude/setup_p4merge.cmd

Created November 9, 2011 08:36
Show Gist options
  • Save daredude/1350855 to your computer and use it in GitHub Desktop.
Save daredude/1350855 to your computer and use it in GitHub Desktop.
Download ZIP
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)
Raw
setup_p4merge.cmd
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

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