Created
August 30, 2016 17:18
-
-
Save vadim-kovalyov/788cf09ea6c717d01ae1944d9c8571f5 to your computer and use it in GitHub Desktop.
How to enable TortoiseGitMerge as an external diff/merge tool in Visual Studio 2015
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
| #Add this into your local (.git/config) or global (%USER_HOME%/.gitconfig) git config file. | |
| [diff] | |
| tool = tgm | |
| [difftool "tgm"] | |
| cmd = \"C:\\Program Files\\TortoiseGit\\bin\\TortoiseGitMerge.exe\" \"$LOCAL\" \"$REMOTE\" | |
| [merge] | |
| tool = tgm | |
| [mergetool "tgm"] | |
| cmd = \"C:\\Program Files\\TortoiseGit\\bin\\TortoiseGitMerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment