您的位置:首页 > 其它

cygwin下配置git difftool

2017-11-29 13:27 253 查看
主要是配置路径问题,方法摘自网络,修改路径名字

[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\"
内容来自用户分享和网络整理,不保证内容的准确性,如有侵权内容,可联系管理员处理 点击这里给我发消息
标签: