git (msys) + merge + araxis

I struggled with setting up the git environment in my windows environment. And since it’s easy to forget these things, I’ll just add the command lines for it here:

1
$ git config --global merge.tool araxis git config --global mergetool.araxis.path 'C:\Program Files (x86)\Araxis\Araxis Merge\Compare.exe' git config --global diff.tool araxis git config --global difftool.araxis.path 'C:\Program Files (x86)\Araxis\Araxis Merge\Compare.exe'

Mathias Westerdahl

Mathias Westerdahl

A game developer since 2001. Currently at http://www.defold.com. Find me at twitter