How to configure merging of Araxis with Git extensions

Question

How to configure Araxis merge / diff using Git Extensions?

I try to configure Araxis merge using "Git Extensions" , but did not find any help, all links or search queries are sent only to Git (using the shell), where as Git Extensions it is a GUI tool, it has (in Global settings ) to configure various tools for merge and diff , etc.

From the difftool drop-down list I choose Araxis , it automatically selects the correct paths to the installed locations

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

From the mergetool drop-down list

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

However, each of them has an additional text field with the diffftool and mergetool comand commands , I tried the following commands in them

 AraxisGitDiff.exe $1 $2 

Remembering that the command above will replace 1 and 2, which is ever selected from Git Extensions, and when I right-click on the file and remove the option "Open with difftool" → "A <-> B " , nothing is displayed on the screen will appear

Similalry does it

 AraxisGitDiff.exe $LOCAL $REMOTE 

does not work

I emptied this entry, I see the 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 --------------------------- 

Answer 1

Settings I use:

• Mergetool - Araxis
• Path to mergetool - C: / Program Files / Araxis / Araxis Merge / Compare.exe

• Mergetool command - / merge / wait / a2 / 3 "$ LOCAL" "$ BASE" "$ REMOTE" "$ MERGED"

• Difftool - araxis

• Path to difftool - C: / Program Files / Araxis / Araxis Merge / Compare.exe
• Difftool command - LEAVE EMPTY

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

UPDATE - 2018-02-19

It seems that newer versions of GitExtensions may not work with the above settings. The changes below should fix any problems.

• Mergetool - Araxis
• Path to mergetool - "C: / Program Files / Araxis / Araxis Merge / Compare.exe"

• Mergetool command - -merge -max -wait -a2 -3 "$ LOCAL" "$ BASE" "$ REMOTE" "$ MERGED"

• Difftool - araxis

• Path to difftool - "C: / Program Files / Araxis / Araxis Merge / Compare.exe"
• Difftool command - -max -2 -wait "$ LOCAL" "$ REMOTE"

Note that there are now double quotes around the toolpath.

Answer 2

The following steps have been tested with Git Extensions v2.47.3.

To use Araxis Merge to compare files and merge files:

• In the Git Extensions browser, select "Settings" from the "Tools" menu.
• In the Settings window, select Global Settings in the tree on the left.
• In the Mergetool drop-down box, select Araxis.

• In the Join Path field, enter the following:

  C:/Program Files/Araxis/Araxis Merge/Compare.exe

• In the Difftool drop-down box, select araxis.

• In the Path to diffftool field, enter the following:

  C:/Program Files/Araxis/Araxis Merge/Compare.exe

: A source

Answer 3

I ran into the same problem and managed to cross out a workable solution by copying a template from kdiff3. This is similar to working with Araxis 2010, and possibly with most future versions.

 Mergetool Araxis Path to mergetool C:/Program Files/Araxis/Araxis Merge/Merge.exe Mergetool command "C:/Program Files/Araxis/Araxis Merge/Merge.exe" "$LOCAL" "$REMOTE" "$MERGED$" Difftool Araxis Path to difftool C:/Program Files/Araxis/Araxis Merge/Merge.exe Diftool command "C:/Program Files/Araxis/Araxis Merge/Merge.exe" "$LOCAL" "$REMOTE" 

Answer 4

Based on Wade's answer, I finally added the PATR folder (containing Merge.exe ) to PATH then used this in my .gitconfig :

 [diff] tool = araxis [difftool] prompt = false [difftool "araxis"] cmd = merge $LOCAL $REMOTE