1GIT-MERGETOOL(1)                  Git Manual                  GIT-MERGETOOL(1)
2
3
4

NAME

6       git-mergetool - Run merge conflict resolution tools to resolve merge
7       conflicts
8

SYNOPSIS

10       git-mergetool [--tool=<tool>] [<file>]...
11

DESCRIPTION

13       Use git mergetool to run one of several merge utilities to resolve
14       merge conflicts. It is typically run after git-merge(1).
15
16       If one or more <file> parameters are given, the merge tool program will
17       be run to resolve differences on each file. If no <file> names are
18       specified, git mergetool will run the merge tool program on every file
19       with merge conflicts.
20

OPTIONS

22       -t or --tool=<tool>
23           Use the merge resolution program specified by <tool>. Valid merge
24           tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
25           and opendiff
26
27           If a merge resolution program is not specified, git mergetool will
28           use the configuration variable merge.tool. If the configuration
29           variable merge.tool is not set, git mergetool will pick a suitable
30           default.
31

AUTHOR

33       Written by Theodore Y Ts´o <tytso@mit.edu>
34

DOCUMENTATION

36       Documentation by Theodore Y Ts´o.
37

GIT

39       Part of the git(7) suite
40
41
42
43
44Git 1.5.3.3                       10/09/2007                  GIT-MERGETOOL(1)