Deployed 8e0ac1d to prerelease with MkDocs 1.6.0 and mike 2.1.1

martinvonz · May 17, 2024 · 5c49b6a · 5c49b6a
1 parent 52b4709
commit 5c49b6a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/prerelease/branches/index.html b/prerelease/branches/index.html
@@ -1561,10 +1561,10 @@ <h2 id="conflicts">Conflicts<a class="headerlink" href="#conflicts" title="Perma
 <p>Branches can end up in a conflicted state. When that happens, <code>jj status</code> will
 include information about the conflicted branches (and instructions for how to
 mitigate it). <code>jj branch list</code> will have details. <code>jj log</code> will show the branch
-name with a question mark suffix (e.g. <code>main?</code>) on each of the conflicted
-branch's potential target revisions. Using the branch name to look up a revision
-will resolve to all potential targets. That means that <code>jj new main</code> will error
-out, complaining that the revset resolved to multiple revisions.</p>
+name with a double question mark suffix (e.g. <code>main??</code>) on each of the
+conflicted branch's potential target revisions. Using the branch name to look up
+a revision will resolve to all potential targets. That means that <code>jj new main</code>
+will error out, complaining that the revset resolved to multiple revisions.</p>
 <p>Both local branches (e.g. <code>main</code>) and the remote branch (e.g. <code>main@origin</code>) can
 have conflicts. Both can end up in that state if concurrent operations were run
 in the repo. The local branch more typically becomes conflicted because it was

diff --git a/prerelease/search/search_index.json b/prerelease/search/search_index.json