How do I configure Araxis Merge for use with Git?

Question

I understand that Araxis Merge is now a "fully supported" mergetool for Git, so that much of what I can find about configuring Git to use it is now out of date. In particular, Araxis Merge should work "out of the box" simply by executing

git config --global merge.tool araxis

provided araxis is on my PATH.

However, for a several reasons, amending my PATH is not an option, so I need to be able to specify the correct path or cmd in .gitconfig.

How should I configure Git (on OS X) so that it finds Araxis Merge? Simply following the example of other tools like kdiff3 and p4merge with

git config --global mergetool.araxis.path /Applications/Araxis Merge.app/Contents/MacOS/Araxis Merge

doesn't work; nor does (guessing) with

git config --global mergetool.araxis.path /Applications/Araxis Merge.app/Contents/Utilities/araxisgitmerge
git config --global difftool.araxis.path /Applications/Araxis Merge.app/Contents/Utilities/araxisgitdiff

How should I configure my araxis.path? Are there additional Git settings that should be used with Araxis Merge?

Answer 1

Git now uses the Araxis compare utility directly, rather than araxisgitdiff and araxisgitmerge, so all that's needed is to set the path to

/Applications/Araxis Merge.app/Contents/Utilities/compare

for example, by executing

git config --global mergetool.araxis.path '/Applications/Araxis Merge.app/Contents/Utilities/compare'

or by directly editing ~/.gitconfig to contain

[mergetool "araxis"]
     path = /Applications/Araxis Merge.app/Contents/Utilities/compare

Answer 2

Hard to make sense of the thread here, so I'm pasting below the exact .gitconfig that worked for me:

[diff]
tool = araxis

[merge]
tool = araxis

[mergetool "araxis"]
        path = /Applications/Araxis Merge.app/Contents/Utilities/compare