Aug 05, · Using WinMerge as the git Diff/Merge Tool on Windows 64bit realtime-windowsserver.comfig. Skip to content. All gists Back to GitHub. Embed Embed this gist in your website. git config realtime-windowsserver.com winmerge. This comment has been minimized. Sign in to view. That being said, those answers were about difftool using winmerge, which doesn't support 3-way merge (there is only local and remote, no base). For a true merge tool, I would recommend kdiff3 (as in "Is it possible for git-merge to ignore line-ending differences?") or araxis (as described in "How to set Araxis as diff / merge tool for MSYS git?". Related posts for variety of diff tools available in market - Use BeyondCompare to see difference between files in GIT, Git: How configure KDiff3 as merge tool and diff tool, use Winmerge inside of Git to file diff, Setting up and using Meld as your git difftool and mergetool, Configuring a diff-tool for Git on Windows – RBT Apr 5 '18 at