Use git mergetool to run one of several merge utilities to resolve
merge conflicts. It is typically run after git merge.
If one or more <file> parameters are given, the merge tool program will be run to resolve differences in each file (skipping those without conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, git mergetool will run the merge tool program on every file with merge conflicts.
- -t <tool>
- --tool=<tool>
-
Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run
git mergetool --tool-helpfor the list of valid <tool> settings.If a merge resolution program is not specified, git mergetool will use the configuration variable
merge.tool. If the configuration variablemerge.toolis not set, git mergetool 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 settingmergetool.kdiff3.path. Otherwise, git mergetool assumes the tool is available in PATH.Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by specifying the command line to invoke in a configuration variable
mergetool.<tool>.cmd.When git mergetool is invoked with this tool (either through the
-tor--tooloption or themerge.toolconfiguration variable), the configured command line will be invoked with$BASEset to the name of a temporary file containing the common base for the merge, if available;$LOCALset to the name of a temporary file containing the contents of the file on the current branch;$REMOTEset to the name of a temporary file containing the contents of the file to be merged, and$MERGEDset 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
mergetool.<tool>.trustExitCodecan be set totrue. Otherwise, git mergetool will prompt the user to indicate the success of the resolution after the custom tool has exited. - --tool-help
-
Print a list of merge tools that may be used with
--tool. - -y
- --no-prompt
-
Don’t prompt before each invocation of the merge resolution program. This is the default if the merge resolution program is explicitly specified with the
--tooloption or with themerge.toolconfiguration variable. - --prompt
-
Prompt before each invocation of the merge resolution program to give the user a chance to skip the path.
- -g
- --gui
-
When git-mergetool is invoked with the
-gor--guioption, the default merge tool will be read from the configuredmerge.guitoolvariable instead ofmerge.tool. Ifmerge.guitoolis not set, we will fallback to the tool configured undermerge.tool. This may be autoselected using the configuration variablemergetool.guiDefault. - --no-gui
-
This overrides a previous
-gor--guisetting ormergetool.guiDefaultconfiguration and reads the default merge tool from the configuredmerge.toolvariable. - -O<orderfile>
-
Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the
diff.orderFileconfiguration variable (see linkgit:git-config[1]). To canceldiff.orderFile, use-O/dev/null.
git mergetool creates *.orig backup files while resolving merges.
These are safe to remove once a file has been merged and its
git mergetool session has completed.
Setting the mergetool.keepBackup configuration variable to false
causes git mergetool to automatically remove the backup files as files
are successfully merged.