diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-30 12:46:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-30 12:46:29 -0800 |
| commit | f0944d08eed3d3165aad9cfdcca655836aa8446e (patch) | |
| tree | 9a35cf4fa102ddc2a99e7b6b5c08b6af750decf5 /git-difftool.html | |
| parent | 6dfc7fe2b697b99b9fdec86d3cf1a567c60a18bb (diff) | |
| download | git-htmldocs-f0944d08eed3d3165aad9cfdcca655836aa8446e.tar.gz | |
Autogenerated HTML docs for v1.7.8-rc4
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-difftool.html b/git-difftool.html index b884f7419..8b1b39555 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -627,7 +627,7 @@ to <em>git diff</em> and accepts the same options and arguments. See <dd>
<p>
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.
</p>
@@ -770,7 +770,7 @@ difftool.prompt <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2011-11-30 12:46:15 PDT
</div>
</div>
</body>
|