Настройка Winmerge в качестве mergetool Git

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

[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

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

Теги:
comments powered by HyperComments