Created
January 9, 2018 08:47
-
-
Save alkampfergit/fca40445f118095e37f549f7058e71cd to your computer and use it in GitHub Desktop.
Configure Visual Studio 2013 as Git Diff and Merge tool
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
| [diff] | |
| tool = vsdiffmerge | |
| [difftool] | |
| prompt = true | |
| [difftool "vsdiffmerge"] | |
| cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t | |
| keepbackup = false | |
| trustexistcode = true | |
| [merge] | |
| tool = vsdiffmerge | |
| [mergetool] | |
| prompt = true | |
| [mergetool "vsdiffmerge"] | |
| cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m | |
| keepbackup = false | |
| trustexistcode = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
If you want to use VS 2015 just change the path to 14.0