How to configure Araxis merge with Git Extensions

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

To use Araxis Merge for file comparison and file merging:

• In the Git Extensions browser, select Settings from the Tools menu.

• In the Settings window, select Global Settings from the tree on the left.

• In the Mergetool drop-down field, select Araxis.

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

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

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

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

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

: Source

The settings I use are:

• 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 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.

• 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 path to the tools.