I\'m trying to use Araxis Merge as my diff / merge tool for MSYSGit.
I found a few resources on the net:
The documentation at araxis has been updated: http://www.araxis.com/merge/documentation-windows/integrating-with-other-applications#Git
I can use the configuration shown there without any modifications.