I\'m using Git Extensions and it pre-installs and sets up KDiff as the diff tool to solve merge conflicts. I\'m very fond of Winmerge though and would like to replace KDiff
@sebastiaan's answer didn't work for me (maybe it is outdated?)
These are "Global settings" that work for me using GitExtensions 2.28:
Mergetool: winmerge
Path to mergetool: D:/path/to/WinMerge/WinMergeU.exe
Mergetool command: "D:/path/to/WinMerge/WinMergeU.exe" -e "$MERGED"
This causes WinMerge to use the "conflict file" generated by git.
-e allows pressing ESC to close winmerge.
Difftool: winmerge
Path to difftool: D:/path/to/WinMerge/WinMergeU.exe
Difftool command: "D:/path/to/WinMerge/WinMergeU.exe" -e "$LOCAL" "$REMOTE" -dl "Local" -dr "Remote"
-dl and -dr set the descriptions for the left and right pane.