Autogenerated HTML docs for v1.6.1-rc2-14-g5363d

1 files changed, 4 insertions, 4 deletions

diff --git a/git-merge-tree.html b/git-merge-tree.html
index 32f628a31..21b3ecea9 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -326,13 +326,13 @@ git-merge-tree(1) Manual Page
 <div class="sectionbody">

 <div class="para"><p>Reads three treeish, and output trivial merge results and

 conflicting stages to the standard output.  This is similar to

-what three-way read-tree -m does, but instead of storing the

+what three-way <em>git read-tree -m</em> does, but instead of storing the

 results in the index, the command outputs the entries to the

 standard output.</p></div>

 <div class="para"><p>This is meant to be used by higher level scripts to compute

-merge results outside index, and stuff the results back into the

+merge results outside of the index, and stuff the results back into the

 index.  For this reason, the output from the command omits

-entries that match &lt;branch1&gt; tree.</p></div>

+entries that match the &lt;branch1&gt; tree.</p></div>

 </div>

 <h2 id="_author">Author</h2>

 <div class="sectionbody">

@@ -348,7 +348,7 @@ entries that match &lt;branch1&gt; tree.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-10-31 11:28:41 UTC

+Last updated 2008-12-10 08:33:20 UTC

 </div>

 </div>

 </body>