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

Question

我正在尝试配置 araxis 与 git 合并并尝试了以下线程：

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

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

configuring araxis merge with git version 2.5.1.windows.1

git

araxis-merge