forked from mirrors/jj
Deployed 5a85254
to prerelease with MkDocs 1.6.0 and mike 2.1.1
This commit is contained in:
parent
b571b609c1
commit
5553ac1014
2 changed files with 27 additions and 1 deletions
|
@ -775,6 +775,15 @@
|
|||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#diff-colors-and-styles" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Diff colors and styles
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
|
@ -1870,6 +1879,15 @@
|
|||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#diff-colors-and-styles" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Diff colors and styles
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
|
@ -2413,6 +2431,14 @@ the editor when describing changes with an empty description. This could be a
|
|||
useful reminder to fill in things like BUG=, TESTED= etc.</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="n">ui</span><span class="p">.</span><span class="n">default-description</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"</span><span class="se">\n\n</span><span class="s2">TESTED=TODO"</span>
|
||||
</code></pre></div>
|
||||
<h3 id="diff-colors-and-styles">Diff colors and styles<a class="headerlink" href="#diff-colors-and-styles" title="Permanent link">¶</a></h3>
|
||||
<p>In color-words diffs, hunks are rendered with underline. You can override the
|
||||
default style with the following keys:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[colors]</span>
|
||||
<span class="c1"># Highlight hunks with background</span>
|
||||
<span class="s2">"diff removed token"</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">bg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">"#221111"</span><span class="p">,</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">false</span><span class="w"> </span><span class="p">}</span>
|
||||
<span class="s2">"diff added token"</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">bg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">"#002200"</span><span class="p">,</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">false</span><span class="w"> </span><span class="p">}</span>
|
||||
</code></pre></div>
|
||||
<h3 id="diff-format">Diff format<a class="headerlink" href="#diff-format" title="Permanent link">¶</a></h3>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># Possible values: "color-words" (default), "git", "summary"</span>
|
||||
<span class="n">ui</span><span class="p">.</span><span class="n">diff</span><span class="p">.</span><span class="n">format</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"git"</span>
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue