I've also tried with the exe named as 'c:/Program Files/Araxis/Araxis Merge/compare.exe' as suggested by one of the answers, with the same results. '/c/Program Files/Araxis/Araxis Merge/compare.exe' -title1:'$1 (repo version)' -title2:'$1 ' -max '$2' '$5'Ĭmd = '/c/Program Files/Araxis/Araxis Merge/compare.exe' -3 -merge -wait $LOCAL $BASE $REMOTE $MERGEDĮxternal diff died, stopping at PowerEditor/src/Notepad_plus.cpp. I created /bin/git-diff-driver.sh #!/bin/sh I 'translated' to Windows as best as I could, but without success: That particular info was geared towards OS X. Finally, there was some info on an older stackoverflow post, but the suggested method doesn't work for me.I also found some info in gitguru, but the actual information re: Araxis is sparse at best, and I could not make anything out of that.On the Araxis site, they mention an 'easy' way, but it implies a executables (araxisgitdiff.exe and araxisgitmerge.exe) that are not part of my distro.I'm trying to use Araxis Merge as my diff / merge tool for MSYSGit.

Araxis merge pro