Merge branch 'maint'

* maint: documentation fix: git difftool uses diff tools, not merge tools.
git-mirror · Nov 21, 2011 · e14d631 · e14d631
2 parents 0f64a5a + 1e501a7
commit e14d631
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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.
 +