Deployed 66808e5 to prerelease with MkDocs 1.6.1 and mike 2.1.3

prerelease/conflicts/index.html

@@ -639,9 +639,9 @@
 </li>
       
         <li class="md-nav__item">
-  <a href="#conflicts-with-missing-terminating-newline-noeol" class="md-nav__link">
+  <a href="#conflicts-with-missing-terminating-newline" class="md-nav__link">
     <span class="md-ellipsis">
-      Conflicts with missing terminating newline ([noeol])
+      Conflicts with missing terminating newline
     </span>
   </a>
   
@@ -1469,9 +1469,9 @@
 </li>
       
         <li class="md-nav__item">
-  <a href="#conflicts-with-missing-terminating-newline-noeol" class="md-nav__link">
+  <a href="#conflicts-with-missing-terminating-newline" class="md-nav__link">
     <span class="md-ellipsis">
-      Conflicts with missing terminating newline ([noeol])
+      Conflicts with missing terminating newline
     </span>
   </a>
   
@@ -1645,32 +1645,30 @@ New Heading
 ===========
 &gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt; Conflict 1 of 1 ends
 </code></pre></div>
-<h2 id="conflicts-with-missing-terminating-newline-noeol">Conflicts with missing terminating newline (<code>[noeol]</code>)<a class="headerlink" href="#conflicts-with-missing-terminating-newline-noeol" title="Permanent link">&para;</a></h2>
+<h2 id="conflicts-with-missing-terminating-newline">Conflicts with missing terminating newline<a class="headerlink" href="#conflicts-with-missing-terminating-newline" title="Permanent link">&para;</a></h2>
 <p>When materializing conflicts, <code>jj</code> outputs them in a line-based format. This
 format is easiest to interpret for text files that consist of a series of lines,
 with each line terminated by a newline character (<code>\n</code>). This means that a text
 file should either be empty, or it should end with a newline character.</p>
-<p>While most text files follow this convention, some do not. To handle this case,
-when <code>jj</code> encounters a missing terminating newline character in a conflict, it
-will add a <code>[noeol]</code> comment to the conflict markers to indicate that the
-"end-of-line" (EOL) character was missing. If you don't care about whether your
-file ends with a terminating newline character, you can generally ignore this
-comment and resolve the conflict normally.</p>
+<p>While most text files follow this convention, some do not. When <code>jj</code> encounters
+a missing terminating newline character in a conflict, it will add a comment to
+the conflict markers to make the conflict easier to interpret. If you don't care
+about whether your file ends with a terminating newline character, you can
+generally ignore this comment and resolve the conflict normally.</p>
 <p>For instance, if a file originally contained <code>grape</code> with no terminating newline
 character, and one person changed <code>grape</code> to <code>grapefruit</code>, while another person
 added the missing newline character to make <code>grape\n</code>, the resulting conflict
 would look like this:</p>
 <div class="highlight"><pre><span></span><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; Conflict 1 of 1
-+++++++ Contents of side #1 [noeol]
++++++++ Contents of side #1 (no terminating newline)
 grapefruit
-%%%%%%% Changes from base to side #2 [-noeol]
+%%%%%%% Changes from base to side #2 (adds terminating newline)
 -grape
 +grape
 &gt;&gt;&gt;&gt;&gt;&gt;&gt; Conflict 1 of 1 ends
 </code></pre></div>
-<p>The <code>[-noeol]</code> comment for the diff section indicates that the base (<code>-</code>) was
-missing a terminating newline character. A resolution of this conflict could be
-<code>grapefruit\n</code>, with the terminating newline character added.</p>
+<p>Therefore, a resolution of this conflict could be <code>grapefruit\n</code>, with the
+terminating newline character added.</p>