The git difftool and git mergetool
commands can be used to launch a variety of external diff and merge tools.
For background information on configuring GIT, see:
https://www.kernel.org/pub/software/scm/git/docs/git-difftool.html
https://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html
