Brandon Wilhite JediMindtrick
shawndumas
/ .gitconfig
Created
August 5, 2013 19:08
Using WinMerge as the git Diff/Merge Tool on Windows 64bit
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
| [mergetool] | |
| prompt = false | |
| keepBackup = false | |
| keepTemporaries = false | |
| [merge] | |
| tool = winmerge | |
| [mergetool "winmerge"] | |
| name = WinMerge |