How do I configure Araxis Merge for use with Git?

问题

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?

回答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

回答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

回答3:

Make sure you are running git version 1.6.4 or above. Copy these utilities from the Utilities folder in the Araxis Merge install image to /usr/local/bin.

araxisgitmerge
araxisopendiff
compare
compare2

Then edit ~/.gitconfig and add these lines:

[diff]
    tool = araxis
[merge]
    tool = araxis

The next time you type git mergetool it should launch the Araxis Merge graphical tool.

This information was taken from the official Araxis documentation here.

回答4:

@raxacoricofallapatorius great answer! But you need to run that command line with quotes (due to the space in Araxis Merge. Without quotes produced a truncated path of "/Applications/Araxis" which didn't work obviously, but adding quotes and re-running that command fixed my issues. Thanks!

Fix:

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

回答5:

If you use SourceTree (I'm using v3.0.8) it's very easy to configure Araxis merge as the external diff tool:

For using Araxis Merge to view file differences:

Install Araxis Merge
In SourceTree: Tools > Options > Diff > External Diff Tool > select AraxisMerge from dropdown > OK

(No need to define the Arguments, no need to restart SourceTree)

Example use:

Right-click an uncommitted file that you want to compare > select 'External Diff' (or select file then CTRL-D) - this will compare the differences between your latest changes and your local repo.

来源：https://stackoverflow.com/questions/14593817/how-do-i-configure-araxis-merge-for-use-with-git

标签

git-merge

git-config