git配置diff、merge工具：kdiff3

git配置

配置文件内容如下：

[diff]
    tool = kdiff3
[merge]
    tool = kdiff3
[difftool "kdiff3"]
    cmd = 'C:/Program Files/KDiff3/kdiff3.exe' "$LOCAL" "$REMOTE"
[mergetool "kdiff3"]
    cmd = 'C:/Program Files/KDiff3/kdiff3.exe' "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
    trustExitCode = true

使用时，命令如下：

git difftool <file>
git mergetool <file>

参考：

kdiff3官网