diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-04-18 06:17:56 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-04-18 06:17:56 +0000 |
| commit | 3bd66e9adf9669a8ba7bf8f191a111ae0cf41e51 (patch) | |
| tree | b0bda7514cbe49768ca02dee664f52a85399c2dd /git-mergetool.html | |
| parent | 98e32c30fcbbbed199fa402656feffe7f4843784 (diff) | |
| download | git-htmldocs-3bd66e9adf9669a8ba7bf8f191a111ae0cf41e51.tar.gz | |
Autogenerated HTML docs for v1.6.3-rc0-53-g1a1f0
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index e884caf44..572031a9d 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -344,7 +344,8 @@ with merge conflicts.</p></div> <p>
Use the merge resolution program specified by <tool>.
Valid merge tools are:
- kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
+ kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
+ diffuse, tortoisemerge and opendiff
</p>
<div class="para"><p>If a merge resolution program is not specified, <em>git-mergetool</em>
will use the configuration variable <tt>merge.tool</tt>. If the
@@ -413,7 +414,7 @@ success of the resolution after the custom tool has exited.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-04-02 06:49:57 UTC
+Last updated 2009-04-18 06:17:32 UTC
</div>
</div>
</body>
|