diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-03-19 10:43:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-03-19 10:43:30 +0000 |
| commit | b8c51282a8560ed048e98bc0db18fc66f6564b04 (patch) | |
| tree | fe6a4f600ac90ff1677a7c9aa27763c97f8c1386 /git-mergetool.txt | |
| parent | 48fd2f66b082013aeca9f5044bf8bf7f668ee168 (diff) | |
| download | git-htmldocs-b8c51282a8560ed048e98bc0db18fc66f6564b04.tar.gz | |
Autogenerated HTML docs for v1.5.1-rc1
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index ae69a0eb8..5baaaca0b 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -25,7 +25,7 @@ OPTIONS -t or --tool=<tool>:: Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, and emerge. + kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. If a merge resolution program is not specified, 'git mergetool' will use the configuration variable merge.tool. If the |