diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
| commit | d2c978f6be36b38127b58af46e28e3ae590b2d3b (patch) | |
| tree | 88d8b45014f2b361e18b1aa71f48160ad7f5dc3f /git-mergetool.txt | |
| parent | fa28cb14513978502ac466090afe34c3479fc90b (diff) | |
| download | git-htmldocs-d2c978f6be36b38127b58af46e28e3ae590b2d3b.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-343-ga91df
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 1834adba7..8c79ae8d2 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -26,8 +26,8 @@ OPTIONS --tool=<tool>:: Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, - diffuse, tortoisemerge, opendiff, p4merge and araxis. + araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3, + meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff. + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable `merge.tool`. If the |