use Winmerge inside of Git to file diff

Question

Is there a way to use Winmerge inside of git to do Diffs?

Answer 1

Without configuration:

git difftool --tool winmerge

Assuming:

• Winmerge is installed
• Git for windows is installed, from "git version 2.12.0.windows1" or above (although earlier versions of git may have introduced the command).

Answer 2

git config --global diff.tool winmerge
git config --global difftool.winmerge.cmd "\"$PROGRAMFILES\\WinMerge\\WinMergeU.exe\" -u -dl \"Local\" -dr \"Remote\" \"\$LOCAL\" \"\$REMOTE\""
git config --global difftool.prompt false

As per the WinMerge command line manual: "Parameters are prefixed with either a forward slash ( / ) or dash ( - ) character"