Skip to content

Instantly share code, notes, and snippets.

@arcadepro

arcadepro/setup_p4merge.cmd

Forked from daredude/setup_p4merge.cmd
Last active August 29, 2015 14:05
Show Gist options
  • Save arcadepro/3c189d082a2dc08594e0 to your computer and use it in GitHub Desktop.
Save arcadepro/3c189d082a2dc08594e0 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