vi ~/.gitconfig
添加并修改软件路径
[diff]
tool = bc3
[difftool]
prompt = false
path = E:/APP/beyondCompare/Beyond/BComp.exe
[difftool "bc3"]
cmd = "\"E:/APP/beyondCompare/Beyond/BComp.exe\" \"$LOCAL\" \"$REMOTE\""
[merge]
tool = bc3
[mergetool]
prompt = false
keepBackup = false
path = E:/APP/beyondCompare/Beyond/BComp.exe
[mergetool "bc3"]
cmd = "\"E:/APP/beyondCompare/Beyond/BComp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""