diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
| commit | d2c978f6be36b38127b58af46e28e3ae590b2d3b (patch) | |
| tree | 88d8b45014f2b361e18b1aa71f48160ad7f5dc3f /git-mergetool.html | |
| parent | fa28cb14513978502ac466090afe34c3479fc90b (diff) | |
| download | git-htmldocs-d2c978f6be36b38127b58af46e28e3ae590b2d3b.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-343-ga91df
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index dfad026a9..63c0700e6 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -438,8 +438,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,
- diffuse, tortoisemerge, opendiff, p4merge and araxis.
+ araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
+ meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
</p>
<div class="paragraph"><p>If a merge resolution program is not specified, <em>git mergetool</em>
will use the configuration variable <tt>merge.tool</tt>. If the
@@ -509,7 +509,7 @@ are successfully merged.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-03-20 19:41:42 UTC
</div>
</div>
</body>
|