summaryrefslogtreecommitdiffstats
path: root/git-merge-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
commitfce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch)
treeffce2ae419b52786a0e567f4fddaadd89016f62c /git-merge-tree.html
parentbb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff)
downloadgit-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-merge-tree.html')
-rw-r--r--git-merge-tree.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-tree.html b/git-merge-tree.html
index e90a53b5a..cb280941d 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -272,7 +272,7 @@ git-merge-tree(1) Manual Page
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-merge-tree</em> &lt;base-tree&gt; &lt;branch1&gt; &lt;branch2&gt;</p>
+<p><em>git merge-tree</em> &lt;base-tree&gt; &lt;branch1&gt; &lt;branch2&gt;</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -300,7 +300,7 @@ entries that match &lt;branch1&gt; tree.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:54 UTC
+Last updated 02-Jul-2008 03:01:53 UTC
</div>
</div>
</body>