Skip to content

Instantly share code, notes, and snippets.

@GiscardBiamby

GiscardBiamby/gist:6392580

Last active December 22, 2015 00:58
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 GiscardBiamby/6392580 to your computer and use it in GitHub Desktop.
Save GiscardBiamby/6392580 to your computer and use it in GitHub Desktop.
Download ZIP
setting up git to use p4merge for merge and diff
Raw
gistfile1.txt
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge.exe $BASE $LOCAL $REMOTE $MERGED'
git config --global mergetool.keepBackup false
git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd 'p4merge.exe $LOCAL $REMOTE'
git config --global difftool.prompt false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment