1git-mergetool(1) 2================ 3 4NAME 5---- 6git-mergetool - Run merge conflict resolution tools to resolve merge conflicts 7 8SYNOPSIS 9-------- 10'git-mergetool' [--tool=<tool>] [<file>]... 11 12DESCRIPTION 13----------- 14 15Use 'git mergetool' to run one of several merge utilities to resolve 16merge conflicts. It is typically run after gitlink:git-merge[1]. 17 18If one or more <file> parameters are given, the merge tool program will 19be run to resolve differences on each file. If no <file> names are 20specified, 'git mergetool' will run the merge tool program on every file 21with merge conflicts. 22 23OPTIONS 24------- 25-t or --tool=<tool>:: 26 Use the merge resolution program specified by <tool>. 27 Valid merge tools are: 28 kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff 29+ 30If a merge resolution program is not specified, 'git mergetool' 31will use the configuration variable merge.tool. If the 32configuration variable merge.tool is not set, 'git mergetool' 33will pick a suitable default. 34+ 35You can explicitly provide a full path to the tool by setting the 36configuration variable mergetool.<tool>.path. For example, you 37can configure the absolute path to kdiff3 by setting 38mergetool.kdiff3.path. Otherwise, 'git mergetool' assumes the tool 39is available in PATH. 40 41Author 42------ 43Written by Theodore Y Ts'o <tytso@mit.edu> 44 45Documentation 46-------------- 47Documentation by Theodore Y Ts'o. 48 49GIT 50--- 51Part of the gitlink:git[7] suite