Araxis merge for mac and git diff

Question

I am trying to use the git command line in os x in conjunction with araxis merge.

I would like git diff foo open it araxis

I copied utilities in the installer to / usr / bin

$ cd /usr/bin/ $ ls | grep araxis araxisgitdiff araxisgitmerge araxishgmerge araxisopendiff araxisp4diff araxisp4winmrg araxissvndiff araxissvndiff3 araxissvnmerge 

I modified my .gitconfig to contain the following:

 [user] name = Me email = [e-mail] [push] default = simple [diff] tool = araxis [merge] tool = araxis 

Doing the following still leads to the diff command line:

$ git diff template.html

Answer 1

Here's the .gitconfig file on os x.

 [mergetool] prompt = false keepTemporaries = false trustExitCode = false keepBackup = false [difftool] prompt = false [diff] tool = araxis [merge] tool = araxis [mergetool "araxis"] path = /Applications/Araxis Merge.app/Contents/Utilities/compare [difftool "araxis"] path = /Applications/Araxis Merge.app/Contents/Utilities/compare 

Then you can decompose all modified files by doing

 $ git difftool 

Answer 2

You need to run git difftool to start it.

On the git config page:

diff.tool
Controls that use the diff tool use git-difftool(1) .

If you want to use git diff , you need to install diff.external instead of diff.tool . Be warned that this can lead to some chagrin if you ever connect to your computer remotely.

diff.external
If this configuration variable is set, difference generation is not performed using internal differentiation mechanisms, but using this command.

For your case, you need something like:

 [diff] external = /usr/bin/araxisgitdiff 

Answer 3

In 2014, it looks like Araxis no longer uses araxisgitdiff or araxisgitmerge - instead, it uses comparison via:

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