The settings I use are:
Mergetool
- AraxisPath to mergetool
-C:\Program Files\Araxis\Araxis Merge\Compare.exe
Mergetool command
-/merge /wait /a2 /3 "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
Difftool
- araxisPath 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
- AraxisPath to mergetool
-"C:\Program Files\Araxis\Araxis Merge\Compare.exe"
Mergetool command
--merge -max -wait -a2 -3 "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
Difftool
- araxisPath 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.