diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-06-11 01:21:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-06-11 01:21:54 +0000 |
| commit | f614c6470329dcb81603708f9710d5dd2c3a9c43 (patch) | |
| tree | ae083e8c046fa8813139d4fa6096b6e156b48bb7 /git-mergetool.html | |
| parent | 4ec0671755f7d81966311dd0e8cace8abf1aeb13 (diff) | |
| download | git-htmldocs-f614c6470329dcb81603708f9710d5dd2c3a9c43.tar.gz | |
Autogenerated HTML docs for v1.5.2.1-174-gcd03
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 aea53acee..523b819b8 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, emerge, vimdiff, and opendiff
+ kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff
</p>
<p>If a merge resolution program is not specified, <em>git mergetool</em>
will use the configuration variable merge.tool. If the
@@ -316,7 +316,7 @@ will pick a suitable default.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2007 16:08:19 UTC
+Last updated 11-Jun-2007 01:21:26 UTC
</div>
</div>
</body>
|