配置araxis合并git版本2.5.1.windows.1



我正在尝试配置araxis合并与git,并尝试下面的线程:

我如何配置Araxis合并使用Git?

然而,它没有为我工作。下面是我的。git配置:

[user]
    email = myemail@email.com
    name = MyName
[mergetool "araxis"]
    path = "C:/Program Files/Araxis/Araxis Merge/Merge.exe"
[difftool "araxis"]
    path = "C:/Program Files/Araxis/Araxis Merge/Merge.exe"

但是当我尝试时,$ git difftool我得到:

This message is displayed because diff.tool is not configured.
See 'git difftool --tool-help' or 'git help config' for more details.
'git difftool' will now attempt to use one of the following tools:
kompare emerge vimdiff

有人能发现这个问题吗?

将此添加到您的配置:

[diff]
tool = araxis

最新更新