Commits

Junio C Hamano  committed e14d631 Merge

Merge branch 'maint'

* maint:
documentation fix: git difftool uses diff tools, not merge tools.

  • Participants
  • Parent commits 0f64a5a, 1e501a7

Comments (0)

Files changed (1)

File Documentation/git-difftool.txt

 -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.
 +