git可视化diff与merge工具

git支持很多种diff和merge工具，可以使用下面的命令查看。

git difftool --tool-help
# or
git mergetool --tool-help

命令输出如下：

'git difftool --tool=<tool>' may be set to one of the following:
        araxis
        vimdiff
        vimdiff2
        vimdiff3

The following tools are valid, but not currently available:
        bc3
        codecompare
        deltawalker
        diffmerge
        diffuse
        ecmerge
        emerge
        gvimdiff
        gvimdiff2
        gvimdiff3
        kdiff3
        kompare
        meld
        opendiff
        p4merge
        tkdiff
        xxdiff

Some of the tools listed above only work in a windowed
environment. If run in a terminal-only session, they will fail.

以上输出的含义是araxis， vimdiff, vimdiff2, vimdiff3这几个工具已经安装在我们的系统上，可以直接使用。
下面列出的其他的工具git也可以支持，但是还