This setting can be left empty when Git supports the mergetool (e.g. Git Extensions will try to set this automatically when a merge tool is chosen. Mergetool command¶ Command that Git uses to start the merge tool. Git Extensions will search for common merge tools on your system. You can explicitly provide a full path to the tool by setting the configuration variable mergetool.path If your merge tool can indicate that a merge conflict is resolved successfully with its exit code, you can set trustExitCode to true, as below: $ git config -global ustExitCode true Otherwise, you will be prompted to indicate whether the merge conflict is resolved or not If p4merge was listed as available, it is in your PATH and you only have to set merge.tool: git config -global merge.tool p4merge If it was listed as valid, you have to define in addition to merge.tool: git config -global c:/Users/my-/AppData/Local/Perforce/p4merge.ex Git Extensions will search for common merge tools on your system. If the configuration variable merge.tool is not set, git mergetool will pick a suitable default. Verify none of the added merge tools are listed If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. Open Git Extensions, open the Settings dialog, select Git Config element on the left. Home Git Extensions merge tool not configured

Araxis merge sourcetree