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?

orome · Accepted Answer · 2014-02-25T23:29:01.787

21

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

edited Feb 25 '14 at 23:29

answered Feb 04 '13 at 19:13

orome

45,163
57
202
418

You can also force it to open in full screen by adding `/max` param at the end, like this `C:\Program Files (x86)\Araxis\Araxis Merge\Compare.exe /max`. Works on Windows – Mladen Janjetovic Feb 06 '15 at 11:29
@MladenJanjetović: Doesn't work. Adding `-max` to `path` fails. – orome Feb 06 '15 at 13:49
@ raxacoricofallapatorius did you try `/max`? Not `-max`. I am using this in tortoiseSvn, too – Mladen Janjetovic Feb 06 '15 at 15:17
@MladenJanjetović: Both. I'm on OS X, so `-max` works from the command line. – orome Feb 06 '15 at 15:23
@ raxacoricofallapatorius - On windows works fine. I see that there is param available on iOS documentation for araxis console, but don't have apple to try: http://www.araxis.com/merge/documentation-os-x/command-line.en – Mladen Janjetovic Feb 06 '15 at 15:32
@MladenJanjetović: I'm not sure why it doesn't work here. The `-max` option does work at the command line. Perhaps you mean `cmd = ...`, sith suitable additional arguments (whatever those are) to capture the commits? – orome Feb 06 '15 at 15:35

score 6 · Answer 2 · answered Nov 01 '16 at 18:18

6

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

answered Nov 01 '16 at 18:18

doubledherin

340
1
3
7

1

for googlers... 1) need use "" after `path =`. `path = "/Applications/Araxis Merge.app/Contents/Utilities/compare"` 2) I added all code to `~/.gitconfig`, local file gitconfig not works, I don't know why... – volos Jul 17 '17 at 10:41

y0ssar1an · Answer 3 · 2013-04-27T23:14:11.877

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.

score 1 · Answer 4 · answered Feb 25 '14 at 23:25

1

@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"

answered Feb 25 '14 at 23:25

Kevin

603
5
7

Thanks. That should be a comment on the answer above, now fixed, or a suggested edit, rather than new answer. – orome Feb 25 '14 at 23:28

score 0 · Answer 5 · answered Mar 12 '19 at 03:32

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.

How do I configure Araxis Merge for use with Git?

5 Answers5

Linked