用git版本2.5.1配置araxis合并窗口1

Question

我正在尝试使用git配置araxis合并，并尝试了下面的线程：

How do I configure Araxis Merge for use with 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

有人能发现这个问题吗？

Answer 1

将此添加到您的配置中：

[diff]
tool = araxis