I\'m trying to use Araxis Merge as my diff / merge tool for MSYSGit.
I found a few resources on the net:
One way I found to do it "simply" is to install TortoiseGit and set the diff / merge tools in TortoiseGit options. However, this does not address the issue if you want to diff from the command line.