diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
| commit | 3f680f3f3b57189c755ddb5f3c7f099ddab1b221 (patch) | |
| tree | 2a5e1f1d44ea53e5d9fa7ebcf56d558feac065c7 /git-difftool.html | |
| parent | e1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff) | |
| download | git-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz | |
Autogenerated HTML docs for v1.6.5.2-215-g77097f
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 7e0df50b2..0723f3c17 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -363,7 +363,7 @@ to <em>git-diff</em> and accepts the same options and arguments.</p></div> Use the diff tool specified by <tool>.
Valid merge tools are:
kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
- ecmerge, diffuse, opendiff and araxis.
+ ecmerge, diffuse, opendiff, p4merge and araxis.
</p>
<div class="para"><p>If a diff tool is not specified, <em>git-difftool</em>
will use the configuration variable <tt>diff.tool</tt>. If the
@@ -474,7 +474,7 @@ difftool.prompt </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-15 09:57:05 UTC
+Last updated 2009-11-16 02:10:11 UTC
</div>
</div>
</body>
|