This article is about the difftool configuration.
Is there a diff with the mergetool?
git difftool --tool=<tool> may be set to one of the following:
The following tools are valid, but not currently available:
Some of the tools listed above only work in a windowed environment. If run in a terminal-only session, they will fail.
git config --global diff.tool toolName
Example p4merge
git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd 'p4merge.exe $LOCAL $REMOTE'
git config --global difftool.prompt false
git difftool --tool-help