H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-04-18 07:03:59 +00:00
Code Releases Activity

Merge branch 'maint'

Browse Source 
* maint:
  documentation fix: git difftool uses diff tools, not merge tools.
This commit is contained in:
Junio C Hamano 2011-11-21 14:30:45 -08:00
commit e14d631988
1 changed files with 1 additions and 1 deletions

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