GIT\-MERGETOOLSection: Git Manual (1)
Index Return to Main Contents
NAMEgit-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSISgit-mergetool [--tool=<tool>] [<file>]...
DESCRIPTIONUse git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git-merge(1).
If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file. If no <file> names are specified, git mergetool will run the merge tool program on every file with merge conflicts.
-t or --tool=<tool>
Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff
If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the configuration variable merge.tool is not set, git mergetool will pick a suitable default.
AUTHORWritten by Theodore Y Ts'o <firstname.lastname@example.org>
DOCUMENTATIONDocumentation by Theodore Y Ts'o.
GITPart of the git(7) suite