ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

Deployed c43096b to prerelease with MkDocs 1.6.0 and mike 2.1.1

Browse source
This commit is contained in:
jj-docs[bot] 2024-08-02 17:37:10 +00:00
parent 527a648cee
commit 8aa9e3751a
4 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
prerelease/conflicts/index.html
View file

@ -1450,15 +1450,15 @@ style</a>:</p>
apple
grapefruit
orange
======= base
||||||| base
apple
grape
orange
||||||| right
=======
APPLE
GRAPE
ORANGE
&gt;&gt;&gt;&gt;&gt;&gt;&gt;
&gt;&gt;&gt;&gt;&gt;&gt;&gt; right
</code></pre></div>
<p>In this example, the left side changed "grape" to "grapefruit", and the right
side made all lines uppercase. To resolve the conflict, we would presumably keep

2
prerelease/search/search_index.json
View file

File diff suppressed because one or more lines are too long

70
prerelease/sitemap.xml
View file

@ -2,177 +2,177 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://martinvonz.github.io/jj/latest/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/FAQ/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/branches/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/cli-reference/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/code-of-conduct/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/community_tools/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/config/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/conflicts/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/contributing/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design_doc_blueprint/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design_docs/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/filesets/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/git-comparison/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/git-compatibility/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/github/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/glossary/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/install-and-setup/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/operation-log/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/related-work/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/revsets/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/sapling-comparison/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/templates/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/testimonials/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/tutorial/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/windows/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/working-copy/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/copy-tracking/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/git-submodule-storage/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/git-submodules/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/run/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/sparse-v2/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/design/tracking-branches/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/technical/architecture/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/technical/concurrency/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/latest/technical/conflicts/</loc>
<lastmod>2024-08-01</lastmod>
<lastmod>2024-08-02</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>

BIN
prerelease/sitemap.xml.gz
View file

Binary file not shown.