Skip to content

Instantly share code, notes, and snippets.

@jcspader
jcspader / .gitconfig
Last active Aug 29, 2015 — forked from shawndumas/.gitconfig
Using WinMerge as the git Diff/Merge Tool on Windows 64bit
View .gitconfig
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[merge]
tool = winmerge
[mergetool "winmerge"]
name = WinMerge