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

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