Autogenerated HTML docs for v2.42.0-482-g2e8e7

1 files changed, 5 insertions, 5 deletions

diff --git a/git-merge-tree.html b/git-merge-tree.html
index 9d4a158bd..a429f6aea 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -761,10 +761,10 @@ git-merge-tree(1) Manual Page
 <div class="paragraph"><p>This command has a modern <code>--write-tree</code> mode and a deprecated

 <code>--trivial-merge</code> mode.  With the exception of the

 <a href="#DEPMERGE">DEPRECATED DESCRIPTION</a> section at the end, the rest of

-this documentation describes modern <code>--write-tree</code> mode.</p></div>

+this documentation describes the modern <code>--write-tree</code> mode.</p></div>

 <div class="paragraph"><p>Performs a merge, but does not make any new commits and does not read

 from or write to either the working tree or index.</p></div>

-<div class="paragraph"><p>The performed merge will use the same feature as the "real"

+<div class="paragraph"><p>The performed merge will use the same features as the "real"

 <a href="git-merge.html">git-merge(1)</a>, including:</p></div>

 <div class="ulist"><ul>

 <li>

@@ -1088,7 +1088,7 @@ in the future).</p></div>
 the <a href="#CFI">Conflicted file info</a> list.  The information there is

 insufficient to do so.  For example: Rename/rename(1to2) conflicts (both

 sides renamed the same file differently) will result in three different

-file having higher order stages (but each only has one higher order

+files having higher order stages (but each only has one higher order

 stage), with no way (short of the <a href="#IM">Informational messages</a> section)

 to determine which three files are related.  File/directory conflicts

 also result in a file with exactly one higher order stage.

@@ -1097,7 +1097,7 @@ Possibly-involved-in-directory-rename conflicts (when
 a file with exactly one higher order stage.  In all cases, the

 <a href="#IM">Informational messages</a> section has the necessary info, though it

 is not designed to be machine parseable.</p></div>

-<div class="paragraph"><p>Do NOT assume that each paths from <a href="#CFI">Conflicted file info</a>, and

+<div class="paragraph"><p>Do NOT assume that each path from <a href="#CFI">Conflicted file info</a>, and

 the logical conflicts in the <a href="#IM">Informational messages</a> have a

 one-to-one mapping, nor that there is a one-to-many mapping, nor a

 many-to-one mapping.  Many-to-many mappings exist, meaning that each

@@ -1152,7 +1152,7 @@ large repositories).</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-03-19 15:16:41 PDT

+ 2023-10-23 14:43:46 PDT

 </div>

 </div>

 </body>