Skip to content

Instantly share code, notes, and snippets.

View JediMindtrick's full-sized avatar

Brandon Wilhite JediMindtrick

View GitHub Profile
@shawndumas
shawndumas / .gitconfig
Created August 5, 2013 19:08
Using WinMerge as the git Diff/Merge Tool on Windows 64bit
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[merge]
tool = winmerge
[mergetool "winmerge"]
name = WinMerge