Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run
git mergetool --tool-help
for the list of valid <tool> settings.
If a merge resolution program is not specified,
will use the configuration variable
merge.tool. If the configuration variable
is not set,
will pick a suitable default.
You can explicitly provide a full path to the tool by setting the configuration variable
mergetool.<tool>.path. For example, you can configure the absolute path to kdiff3 by setting
assumes the tool is available in PATH.
Instead of running one of the known merge tool programs,
can be customized to run an alternative program by specifying the command line to invoke in a configuration variable
is invoked with this tool (either through the
option or the
configuration variable) the configured command line will be invoked with
set to the name of a temporary file containing the common base for the merge, if available;
set to the name of a temporary file containing the contents of the file on the current branch;
set to the name of a temporary file containing the contents of the file to be merged, and
set to the name of the file to which the merge tool should write the result of the merge resolution.
If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable
can be set to
will prompt the user to indicate the success of the resolution after the custom tool has exited.