I got it working, with msysgit version 1.6.gee46c, under DOS or Git Bash, with an evaluation license for Araxis Merge 2009, v2009.3713: So, the question is: Is there anybody who successfully uses Araxis Merge to diff and merge stuff with MSYSGit, and if so, how do you it?
![git run araxis merge git run araxis merge](https://kihontekina.dev/posts/git_conflicts/img/sourcetree_settings.png)
#Git run araxis merge how to
I've found that it can easily be set if you use TortoiseGit, but it seems to handle diff by itself and no settings from TortoiseGit give any indication on how to set up Araxis as a merge tool when diff is invoked from the command line. 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.
![git run araxis merge git run araxis merge](https://linuxfromanoobie.files.wordpress.com/2018/05/screenshot-from-2018-05-27-11-39-15.png)
![git run araxis merge git run araxis merge](https://i.stack.imgur.com/G6gBE.png)
I'm trying to use Araxis Merge as my diff / merge tool for MSYSGit.