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 dat

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