diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-11-02 02:47:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-11-02 02:47:50 +0000 |
| commit | 1c70883dc871f015b3f14945f7c310325ab4aba8 (patch) | |
| tree | 1fc62d49807a32d921c552f0763ccd04116a777a /git-mergetool.txt | |
| parent | 1974bf2632180e353120c4cd1dca476df26c5bc0 (diff) | |
| download | git-htmldocs-1c70883dc871f015b3f14945f7c310325ab4aba8.tar.gz | |
Autogenerated HTML docs for v1.5.3.5-474-g3e4bb
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 6c32c6d18..a26c26016 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -25,12 +25,18 @@ OPTIONS -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 + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, 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. ++ +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 setting +mergetool.kdiff3.path. Otherwise, 'git mergetool' assumes the tool +is available in PATH. Author ------ |