summaryrefslogtreecommitdiffstats
path: root/git-merge-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-07-23 00:51:59 +0000
committerJunio C Hamano <junio@kernel.org>2011-07-23 00:51:59 +0000
commit15567bc0c61c951197cb392b835678729534de57 (patch)
tree8be698fd27be92da0c23a77720987071e73b1d69 /git-merge-tree.html
parent708376e8576f6d39b62b27ee9dfe7292c652f728 (diff)
downloadgit-htmldocs-15567bc0c61c951197cb392b835678729534de57.tar.gz
Autogenerated HTML docs for v1.7.6-345-g5c2f8
Diffstat (limited to 'git-merge-tree.html')
-rw-r--r--git-merge-tree.html7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-merge-tree.html b/git-merge-tree.html
index 449045e0b..f14b097cb 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -414,7 +414,10 @@ git-merge-tree(1) Manual Page
</div>
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
-<div class="paragraph"><p><em>git merge-tree</em> &lt;base-tree&gt; &lt;branch1&gt; &lt;branch2&gt;</p></div>
+<div class="verseblock">
+<div class="verseblock-content"><em>git merge-tree</em> &lt;base-tree&gt; &lt;branch1&gt; &lt;branch2&gt;</div>
+<div class="verseblock-attribution">
+</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -434,7 +437,7 @@ entries that match the &lt;branch1&gt; tree.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-07-23 00:49:30 UTC
</div>
</div>
</body>