Skip to content

Instantly share code, notes, and snippets.

@mohitt

mohitt/setup_p4merge.cmd

Forked from daredude/setup_p4merge.cmd
Last active August 29, 2015 14:05
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 mohitt/363846fbdb0c9b3a7bce to your computer and use it in GitHub Desktop.
Save mohitt/363846fbdb0c9b3a7bce to your computer and use it in GitHub Desktop.
Download ZIP
Raw
setup_p4merge.cmd
# This is with git v1.9.4, make sure to put "C:\Program Files\Perforce" in path
git config --global merge.tool p4merge
git config --global diff.tool p4merge
git config --global --add difftool.prompt false
git config --global --add mergetool.prompt false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment