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, and vimdiff. 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 35Author 36------ 37Written by Theodore Y Ts'o <tytso@mit.edu> 38 39Documentation 40-------------- 41Documentation by Theodore Y Ts'o. 42 43GIT 44--- 45Part of the gitlink:git[7] suite 46