git 配置第三方比较工具(2)

转载：https://blog.csdn.net/qfturauyls/article/details/109371860
3.2：在~/.gitconfig中添加如下配置。

[diff]
    tool = bcomp
[difftool "bcomp"]
    cmd = \"/usr/local/bin/bcomp\" \"$LOCAL\" \"$REMOTE\"
[difftool]
    prompt = false
[merge]
    tool = bcomp
[mergetool]
    prompt = false
[mergetool "bcomp"]
    cmd = \"/usr/local/bin/bcomp\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"

附上我自己的

[user]
[core]
    quotepath = false
[credential]
[user]
    name = ***
    email = ***
[credential]
    helper = store
[diff]
    tool = bcomp
[difftool "bcomp"]
    cmd = \"/usr/bin/bcompare\" \"$LOCAL\" \"$REMOTE\"
[difftool]
    prompt = false