How do I configure Araxis Merge for use with Git?

git-merge git-config
orome picture orome · Jan 30, 2013 · Viewed 15.7k times · Source

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

orome picture orome · Feb 4, 2013

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

Related questions

GIT warning: too many files skipping inexact rename detection

Am aware that the the default rename limit is 100 and can increase this value using the config "diff.renamelimit config" What am worried is, if this config is not setup, will there be a wrong merge, any missing code? Am …

Read More
How to configure "git pull --ff-only" and "git merge --no-ff"

A typical git workflow for me is to clone a remote repository and use git pull to keep it up-to-date. I don't want merge commits when I pull, so i use the --ff-only option. I also make local branches for …

Read More
How to resolve merge conflicts in Git repository?

I want to resolve merge conflicts in my Git repository. How to do that ?

Read More