diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-05-04 07:07:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-05-04 07:07:37 +0000 |
| commit | ee62a7b284d15bc30fbbca7fd3bf86710de148bc (patch) | |
| tree | 9bea66cd0765cccc098c9c018e5734e36a2c9e6f /git-mergetool.html | |
| parent | b63afffe7defea8a86848a96bea694e7fa0dc0cd (diff) | |
| download | git-htmldocs-ee62a7b284d15bc30fbbca7fd3bf86710de148bc.tar.gz | |
Autogenerated HTML docs for v1.5.2-rc1-20-g86b9
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 c11ca0730..0601ca696 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, and vimdiff.
+ kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, 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 04-Apr-2007 18:33:51 UTC
+Last updated 04-May-2007 07:07:21 UTC
</div>
</div>
</body>
|