diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-03-19 10:43:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-03-19 10:43:30 +0000 |
| commit | b8c51282a8560ed048e98bc0db18fc66f6564b04 (patch) | |
| tree | fe6a4f600ac90ff1677a7c9aa27763c97f8c1386 /git-mergetool.html | |
| parent | 48fd2f66b082013aeca9f5044bf8bf7f668ee168 (diff) | |
| download | git-htmldocs-b8c51282a8560ed048e98bc0db18fc66f6564b04.tar.gz | |
Autogenerated HTML docs for v1.5.1-rc1
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index a27739749..32065ec25 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -293,7 +293,7 @@ with merge conflicts.</p> <p>
Use the merge resolution program specified by <tool>.
Valid merge tools are:
- kdiff3, tkdiff, meld, xxdiff, and emerge.
+ kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
</p>
<div class="literalblock">
<div class="content">
@@ -319,7 +319,7 @@ will pick a suitable default.</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 14-Mar-2007 11:19:12 UTC
+Last updated 19-Mar-2007 10:43:14 UTC
</div>
</div>
</body>
|