diff options
| author |  Tim Henigan <tim.henigan@gmail.com> | 2012-03-15 12:28:26 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-03-15 13:53:39 -0700 |
| commit | 79e0fe634865462551cf3fcad25c9a595652e925 (patch) | |
| tree | 3a016c11f59a2d20e7041c263d2febae32752830 | |
| parent | mergetools: add a plug-in to support DeltaWalker (diff) | |
| download | tgif-79e0fe634865462551cf3fcad25c9a595652e925.tar.xz | |
Documentation/difftool: add deltawalker to list of valid diff tools
deltawalker has been supported since 284a126c3ef3, but was not added
to the list of valid diff tools reported by 'git difftool --help'.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-difftool.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 19d473c070..fe38f667f9 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -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 |