diff options
| author |  Thomas Hochstein <thh@inter.net> | 2011-11-14 23:55:52 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-11-21 09:14:34 -0800 |
| commit | 1e501a7c47ad5ada53d3b1acfb9f131f76e969ec (patch) | |
| tree | 4250bf0810925d04e1bb4841da0b6b4bc05dc77b /Documentation | |
| parent | Git 1.7.7.4 (diff) | |
| download | tgif-1e501a7c47ad5ada53d3b1acfb9f131f76e969ec.tar.xz | |
documentation fix: git difftool uses diff tools, not merge tools.
Let the documentation for -t list valid *diff* tools,
not valid *merge* tools.
Signed-off-by: Thomas Hochstein <thh@inter.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-difftool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index a03515f1ec..19d473c070 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/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. + |