超越4作为Windows 10 Pro上Git的Difftool

时间:2018-01-15 11:09:34

标签: git windows-10 beyondcompare4

我正在尝试将Beyond Compare 4(v4.2.3)设置为Git的difftoolv2.15.1.windows.2),但我无法启动它。我跟着instructions they've given,但它不起作用!

我的.gitconfig看起来像这样:

[diff]
    tool = bc3
[difftool "bc3"]
    path = c:/Program Files/Beyond Compare 4/bcomp.exe
[merge]
    tool = bc3
[mergetool "bc3"]
    path = c:/Program Files/Beyond Compare 4/bcomp.exe

当我跑步时,以下内容:

git difftool src\CF1.Charles.Helpers\CF1.Charles.Helpers.csproj

什么都没发生!我再次得到命令提示符。

我错过了什么?

1 个答案:

答案 0 :(得分:1)

尝试以下方法:

[merge]
        tool = bc3
[mergetool "bc3"]
        cmd = \"C:\\Program Files (x86)\\Beyond Compare 3\\Bcomp.exe\" "$(cygpath -w $LOCAL)" "$REMOTE"
[diff]
        tool = bc3
[difftool "bc3"]
        cmd = \"C:\\Program Files (x86)\\Beyond Compare 3\\Bcomp.exe\" "$(cygpath -w $LOCAL)" "$REMOTE"