Merge branch 'maint'
* maint: documentation fix: git difftool uses diff tools, not merge tools.
This commit is contained in:
commit
e14d631988
@ -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.
|
||||
+
|
||||
|
Loading…
Reference in New Issue
Block a user