[PATCH] documentation fix: git difftool uses diff tools, not merge tools.
- From
Thomas Hochstein <thh@inter.net>
- Date
- Nov 14, 2011, 22:55 UTC
- Message-ID
- <1321311352-8950-1-git-send-email-thh@inter.net>
Let the documentation for -t list valid *diff* tools, not valid *merge* tools.
Signed-off-by: Thomas Hochstein <thh@inter.net> --- 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 a03515f..19d473c 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. +
-- 1.7.2.5