Merge branch 'maint'

gitster · gitster · commit e14d63198867 · 2011-11-21T14:30:45.000-08:00
* maint:
  documentation fix: git difftool uses diff tools, not merge tools.
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.
 +

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ OPTIONS`
`31`	`31`	`-t <tool>::`
`32`	`32`	`--tool=<tool>::`
`33`	`33`	`Use the diff tool specified by <tool>.`
`34`		`- Valid merge tools are:`
	`34`	`+ Valid diff tools are:`
`35`	`35`	`araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,`
`36`	`36`	`kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.`
`37`	`37`	`+`