Changes the engine merge tool. When the engine is in 'merge-if-change' mode (see see engine mode), a merge tool is inkoked with the two conflicting versions of the destination file. If the merge tools exits successfuly, the generated file is replaced by the merged version.
There are two builtin tools:
interactive
andauto
.interactive
interactively prompts the user for each patch to be applied to merge the final destination. The user can accept or reject the patch, or leave the destination file unchanged. Theauto
builtin tool automatically merges the two files and places conflict markers (<<<<<<<
and>>>>>>>
) were appropriate in the destination file.Parameters:
- tool
- The path to the merge tool executable (e.g. meld), or one of the builtin keywords
interactive
orauto
.