diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-16 11:50:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-16 11:50:43 -0700 |
| commit | 892d90ec9b6d7c228e63b6eead67b76a5730f621 (patch) | |
| tree | a8a617a40584c6e72a87c5f26f7a4e747d819d04 /git-difftool.html | |
| parent | e768cc13cb7472ba915c92243f3bd5fdbb9fe66f (diff) | |
| download | git-htmldocs-892d90ec9b6d7c228e63b6eead67b76a5730f621.tar.gz | |
Autogenerated HTML docs for v1.7.10-rc1-22-gf5241
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-difftool.html b/git-difftool.html index 8b1b39555..26b8dc79e 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -628,8 +628,9 @@ to <em>git diff</em> and accepts the same options and arguments. See <p>
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.
</p>
<div class="paragraph"><p>If a diff tool is not specified, <em>git difftool</em>
will use the configuration variable <tt>diff.tool</tt>. If the
@@ -770,7 +771,7 @@ difftool.prompt <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-30 12:46:15 PDT
+Last updated 2012-03-16 11:50:29 PDT
</div>
</div>
</body>
|