В конфигурационном файле git нужно добавить:

[code] [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

[/code]

Источник: https://gist.github.com/shawndumas/6158524

03.06.2015