windows - How to set Araxis as diff / merge tool for MSYS git? -


I am trying to use MSYSGit as my diff / merge tool.

I got some resources on the net

  • On the way they refer to an "easy" way, but it means an executable (araxisgitdiff.exe and araxisgitmerge.exe) that are not part of my distro
    • < Li> I have also got some information, but actual information again: Araxis is in the best position, and I could not do anything with that.
  • Finally, there was some information on the old, but the recommended method does not work for me. This particular information was prepared for OS X. I did the best as "translation" for windows, but without success:

I created / bin / git-diff-driver Sh 

  #! / Bin / sh "/ c / program files / Araxis / Araxis merge / comparison .exe" -title1: "$ 1 (repo version)" - title 2: "$ 1" maximum "$ 2" "$ 5"

and edit gitconfig 

  [merge] tool = araxismerge [mergetool "araxismerge"] cmd = "/ c / program files / Araxis / Araxis merge / compare.exe "-3-wait wait $ local $ base $ remote $ merge [diff] external =" / bin / git-diff driver .sh "

and Only one result I get:

$ git diff HEAD ^ HEAD
External difference dies, stop at PowerEditor / src /Notepad_plus.cpp

< Hour>

Edit :.

I have also tried with the exe designated as "c: / program files / Araxis / arxis merge / comparison .exe" as one of the answers Has been suggested, with the same result.

Edit:

I've found that if you use torrentizigit, it can be easily set, but it seems that the difference is by itself Handles and no setting from TortoiseGuit gives no indication that when setting up Arakis as a merge tool, when the difference from the command line applies

edit:

< P> So, the question is: Is there anyone who used ARXIS merge successfully Rke doing stuff and merge with Mswaisjit, and if so, how do you do it?

If you want 'git diff' always use arciss, then you are given in the help file You can use the instructions, but if you want to control the use of 'git diff', then you usually want to attach the Rxis GUI to the command line and 'GIT defaphult'.

Try adding the following to your GIT config: 

  [difftool "Araxis"] path = "/ c / program files / Araxis / Araxis merge / compare. Exe "name = true trustExitCode = true [diff] tool = Araxis state = true [mergetool" araxismergetool "] cmd = 'c: \\ program files \\ Araxis \\ Araxis \\ araxisgitmerge.exe merge'" $ Remote "" $ base "" $ PWD / $ local "" $ PWD / $ merged "trustExitCode = false [mergetool] keepBackup = false [merge] tool = araxismergetool stat = true

Comments

Post a Comment