[SOLVED] araxis merge for mac and git diff

araxis merge for mac and git diff

I'm trying to use command line git on os x in conjunction with araxis merge.

I'd like git diff foo to open it araxis

I've copied the utilties in the installer to /usr/bin

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

I've modified my .gitconfig to contain the following:

[user]
    name = Me
    email = Me@Me.com
[push]
    default = simple
[diff] 
tool = araxis
[merge] 
tool = araxis

Executing the following still results in a command line diff:

$ git diff template.html

Solution

Here's a .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

You can then diff all changed files by executing

$ git difftool