Merge branch 'maint'

* maint: documentation fix: git difftool uses diff tools, not merge tools.
2011-11-21 14:30:45 -08:00 · 2011-11-21 14:30:45 -08:00 · e14d631988
parent 0f64a5a3a2 1e501a7c47
commit e14d631988
1 changed files with 1 additions and 1 deletions
--- 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.
 +