Created
May 30, 2012 09:39
-
-
Save tormodfj/2835130 to your computer and use it in GitHub Desktop.
Configuring Git with P4Merge
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 \"$LOCAL\" \"$REMOTE\"' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment