提交 79e0fe63 编写于 作者: T Tim Henigan 提交者: Junio C Hamano

Documentation/difftool: add deltawalker to list of valid diff tools

deltawalker has been supported since 284a126c, but was not added
to the list of valid diff tools reported by 'git difftool --help'.
Signed-off-by: NTim Henigan <tim.henigan@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 284a126c
......@@ -32,8 +32,9 @@ OPTIONS
--tool=<tool>::
Use the diff tool specified by <tool>.
Valid diff tools are:
araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff,
kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and
xxdiff.
+
If a diff tool is not specified, 'git difftool'
will use the configuration variable `diff.tool`. If the
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册