Autogenerated HTML docs for v2.43.0-232-ge7955

1 files changed, 3 insertions, 3 deletions

diff --git a/git-merge.html b/git-merge.html
index 821f0f67c..79cade40e 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -1089,7 +1089,7 @@ option can be used to override --squash.</p></div>
 <dd>

 <p>

         Automatically create a temporary stash entry before the operation

-        begins, record it in the special ref <code>MERGE_AUTOSTASH</code>

+        begins, record it in the ref <code>MERGE_AUTOSTASH</code>

         and apply it after the operation ends.  This means

         that you can run the operation on a dirty worktree.  However, use

         with care: the final stash application after a successful

@@ -1307,7 +1307,7 @@ For conflicting paths, the index file records up to three
 </li>

 <li>

 <p>

-A special ref <code>AUTO_MERGE</code> is written, pointing to a tree

+A ref named <code>AUTO_MERGE</code> is written, pointing to a tree

    corresponding to the current content of the working tree (including

    conflict markers for textual conflicts).  Note that this ref is only

    written when the <em>ort</em> merge strategy is used (the default).

@@ -2336,7 +2336,7 @@ merge.&lt;driver&gt;.recursive
 <div id="footer">

 <div id="footer-text">

 Last updated

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

+ 2023-12-27 15:50:18 PST

 </div>

 </div>

 </body>