diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-30 12:46:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-30 12:46:29 -0800 |
| commit | f0944d08eed3d3165aad9cfdcca655836aa8446e (patch) | |
| tree | 9a35cf4fa102ddc2a99e7b6b5c08b6af750decf5 /git-difftool.txt | |
| parent | 6dfc7fe2b697b99b9fdec86d3cf1a567c60a18bb (diff) | |
| download | git-htmldocs-f0944d08eed3d3165aad9cfdcca655836aa8446e.tar.gz | |
Autogenerated HTML docs for v1.7.8-rc4
Diffstat (limited to 'git-difftool.txt')
| -rw-r--r-- | git-difftool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index a03515f1e..19d473c07 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -31,7 +31,7 @@ OPTIONS -t <tool>:: --tool=<tool>:: Use the diff tool specified by <tool>. - Valid merge tools are: + Valid diff tools are: araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff. + |