-
-
Save mohitt/363846fbdb0c9b3a7bce to your computer and use it in GitHub Desktop.
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
# 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