Using WinMerge as the git Diff/Merge Tool on Windows 64bit

.gitconfig

[mergetool]
    prompt = false
    keepBackup = false
    keepTemporaries = false

[merge]
    tool = winmerge

[mergetool "winmerge"]
    name = WinMerge
    trustExitCode = true
    cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED

[diff]
    tool = winmerge

[difftool "winmerge"]
    name = WinMerge
    trustExitCode = true
    cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE

For folks like me who really don't like WinMerge 3-way UI, but are fine with 2-way UI:

[mergetool "winmerge"]
        name = WinMerge
        trustExitCode = true
        cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe\" \"$REMOTE\"

This makes WinMerge parse the conflicts and show a 2-way UI where the left hand side ("Mine") is what eventually saved to the file.