Skip to content

Instantly share code, notes, and snippets.

@miknonny

miknonny/setup_p4merge.cmd

Forked from daredude/setup_p4merge.cmd
Created May 14, 2013 17:29
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save miknonny/5577822 to your computer and use it in GitHub Desktop.
Save miknonny/5577822 to your computer and use it in GitHub Desktop.
Download ZIP
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\"'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment