mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'th/mergetools-deltawalker'

Browse Source 
* th/mergetools-deltawalker:
  Documentation/difftool: add deltawalker to list of valid diff tools
This commit is contained in:
Junio C Hamano
2012-03-16 08:24:19 -07:00
parent c3117b2166 79e0fe6348
commit 0987145dd3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-difftool.txt
View File

@ -32,8 +32,9 @@ OPTIONS
--tool=<tool>:: --tool=<tool>::
Use the diff tool specified by <tool>. Use the diff tool specified by <tool>.
Valid diff tools are: Valid diff tools are:
araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3, araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff,
kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff. kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and
xxdiff.
+ +
If a diff tool is not specified, 'git difftool' If a diff tool is not specified, 'git difftool'
will use the configuration variable `diff.tool`. If the will use the configuration variable `diff.tool`. If the