Using github desktop, open a Git Shell (I have it configured to use Git Bash).
Then these commands to configure merge and diff tools (assuming you have winmerge installed):
And then to use it, type this in Git Bash:
(reference)
Then these commands to configure merge and diff tools (assuming you have winmerge installed):
git config merge.tool winmerge --global
git config diff.tool winmerge --global
And then to use it, type this in Git Bash:
git mergetool
(reference)
