主要是配置路径问题,方法摘自网络,修改路径名字
[diff]
tool = jellybc4[difftool]
prompt = false
[difftool "jellybc4"]
#use cygpath to transform cygwin path $LOCAL (something like /tmp/U5VvP1_abc) to windows path, because bc3 is a windows software
cmd = \"/cygdrive/c/Program Files/Beyond Compare 4/BCompare.exe\" \"$(cygpath -w $LOCAL)\" \"$REMOTE\"
[merge]
tool = jellybc4
[mergetool]
prompt = false
[mergetool "jellybc4"]
#trustExitCode = true
cmd = \"/cygdrive/c/Program Files/Beyond Compare 4/BCompare.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" \"$MERGED\"