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

Deployed 9a990ad to prerelease with MkDocs 1.5.3 and mike 2.0.0

Browse source
This commit is contained in:
jj-docs[bot] 2023-12-18 06:16:35 +00:00
parent e80340d583
commit a9fe158ec7
4 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
prerelease/config/index.html
View file

@ -1931,8 +1931,8 @@ this file will be ignored. To suppress the creation of this file, set
<code>ui.diff-instructions = false</code>.</p>
<h3 id="using-vim-as-a-diff-editor">Using Vim as a diff editor<a class="headerlink" href="#using-vim-as-a-diff-editor" title="Permanent link">&para;</a></h3>
<p>Using <code>ui.diff-editor = "vimdiff"</code> is possible but not recommended. For a better
experience, you can follow these <a href="https://gist.github.com/ilyagr/5d6339fb7dac5e7ab06fe1561ec62d45">instructions</a> to configure
the <a href="https://github.com/will133/vim-dirdiff">DirDiff Vim plugin</a> and/or the <a href="https://github.com/balki/vimtabdiff">vimtabdiff Python script</a>.</p>
experience, you can follow <a href="https://github.com/martinvonz/jj/wiki/Vim#using-vim-as-a-diff-tool">instructions from the Wiki</a> to configure the
<a href="https://github.com/will133/vim-dirdiff">DirDiff Vim plugin</a> and/or the <a href="https://github.com/balki/vimtabdiff">vimtabdiff Python script</a>.</p>
<h2 id="3-way-merge-tools-for-conflict-resolution">3-way merge tools for conflict resolution<a class="headerlink" href="#3-way-merge-tools-for-conflict-resolution" title="Permanent link">&para;</a></h2>
<p>The <code>ui.merge-editor</code> key specifies the tool used for three-way merge tools
by <code>jj resolve</code>. For example:</p>

2
prerelease/search/search_index.json
View file

File diff suppressed because one or more lines are too long

52
prerelease/sitemap.xml
View file

@ -2,132 +2,132 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://martinvonz.github.io/jj/prerelease/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/FAQ/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/branches/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/config/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/conflicts/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/contributing/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/github/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/glossary/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/operation-log/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/related-work/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/revsets/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/templates/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/tutorial/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/working-copy/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/run/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts/</loc>
<lastmod>2023-12-17</lastmod>
<lastmod>2023-12-18</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>

BIN
prerelease/sitemap.xml.gz
View file

Binary file not shown.