Subject: [PATCH] Documentation: minor consistency fixes in git-difftool.txt.

From: David Aguilar <[email-masked]>
Date: Tue, 24 Mar 2009 23:14:15 -0700

Signed-off-by: David Aguilar <[email-masked]>
---
 Documentation/git-difftool.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 5ae02f8..23070c1 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 'git-difftool' is a git command that allows you to compare and edit files
-between revisions using common diff tools.  'git difftool' is a frontend
+between revisions using common diff tools.  'git-difftool' is a frontend
 to 'git-diff' and accepts the same options and arguments.
 
 OPTIONS
@@ -23,7 +23,7 @@ OPTIONS
 -t <tool>::
 --tool=<tool>::
 	Use the diff tool specified by <tool>.
-	Valid merge tools are:
+	Valid diff tools are:
 	kdiff3, kompare, tkdiff, meld, xxdiff, emerge,
 	vimdiff, gvimdiff, ecmerge, and opendiff
 +
@@ -50,7 +50,7 @@ variables available: `$LOCAL` is set to the name of the temporary
 file containing the contents of the diff pre-image and `$REMOTE`
 is set to the name of the temporary file containing the contents
 of the diff post-image.  `$BASE` is provided for compatibility
-with custom merge tool commands and has the same value as `$LOCAL`.
+with custom 'git-mergetool' commands and has the same value as `$LOCAL`.
 
 See linkgit:git-diff[1] for the full list of supported options.
 
-- 
1.6.2.1.303.g63699