gitmergegit-extensionsaraxis-merge

How to configure Araxis merge with Git Extensions

How to configure Araxis merge/diff with Git Extensions?

I am trying to configure Araxis merge tool with "Git Extensions", but found no help, all links or searches directs to Git only (using shell), Where as Git Extensions is GUI tool, it has an option (in Global Settings ) to configure different tools for merge and diff etc.

From difftool dropdown I select Araxis, it automatically selects the correct paths of installed locations

 C:/Program Files (x86)/Araxis/Araxis Merge/AraxisGitDiff.exe

From mergetool dropdown 

C:/Program Files (x86)/Araxis/Araxis Merge/AraxisGitMerge.exe

However each of them has an extra textbox with difftool command and mergetool comand, I have tried following commands in them

AraxisGitDiff.exe $1 $2

Keeping in mind that above command will substitute 1 and 2 what ever is selected from Git Extensions, and when I right click on a file and sletect the option "Open with difftool" -> "A <-> B " nothing appears on the screen

Similalry making it

AraxisGitDiff.exe $LOCAL $REMOTE

does not work

I empty this filed I see following error.

---------------------------
Araxis Merge Command Line Compare Utility v7.0
---------------------------
Usage:

araxisgitdiff [/? | /h] <path> <old-file> <old-hex> <old-mode> <new-file> <new-hex> <new-mode>

---------------------------
OK   
---------------------------
Solution

  • The settings I use are:

    When merging, the left pane will be the local file and the right pane will be the remote file. The center pane contains the base file (or common ancestor) and you have to merge into this file/pane.

    UPDATE - 2018-02-19

    Seems that newer versions of GitExtensions may not work with the settings above. The changes below should fix any issues.

    Note that there are now double quotes around the path to the tools.