I\'m trying to integrate WinMerge with Git as I\'ve seen others done before on Windows 7 Ultimate.
I\'ve followed the following steps, but an error continues to show
To do WinMerge as compare and merge tool for Visual Studio 2017 Git Plugin:
From windows command prompt: type >> git config --global --edit which will open the .getconfig file to edit.
Please update with below command:
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[merge]
tool = winmerge
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe\" -e -u -dl \"Base\" -dr \"Mine\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[diff]
tool = winmerge
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe\" -u -e $LOCAL $REMOTE