-
Download SourceGear DiffMerge: http://sourcegear.com/diffmerge/index.html
-
Add the following to your global
.gitconfig
file:[diff] tool = DiffMerge [difftool "DiffMerge"] cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' "$LOCAL" "$REMOTE" [merge]
tool = DiffMerge