forked from mirrors/jj
Deployed 415ae5c
to prerelease with MkDocs 1.5.3 and mike 2.0.0
This commit is contained in:
parent
182780ce6e
commit
b4a04d1543
3 changed files with 5 additions and 4 deletions
|
@ -2221,10 +2221,11 @@ useful reminder to fill in things like BUG=, TESTED= etc.</p>
|
|||
<h3 id="generating-diffs-by-external-command">Generating diffs by external command<a class="headerlink" href="#generating-diffs-by-external-command" title="Permanent link">¶</a></h3>
|
||||
<p>If <code>ui.diff.tool</code> is set, the specified diff command will be called instead of
|
||||
the internal diff function.</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># Use Difftastic by default</span>
|
||||
<span class="n">ui</span><span class="p">.</span><span class="n">diff</span><span class="p">.</span><span class="n">tool</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s2">"difft"</span><span class="p">,</span><span class="w"> </span><span class="s2">"--color=always"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$left"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$right"</span><span class="p">]</span>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[ui]</span>
|
||||
<span class="c1"># Use Difftastic by default</span>
|
||||
<span class="n">diff</span><span class="p">.</span><span class="n">tool</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s2">"difft"</span><span class="p">,</span><span class="w"> </span><span class="s2">"--color=always"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$left"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$right"</span><span class="p">]</span>
|
||||
<span class="c1"># Use tool named "<name>" (see below)</span>
|
||||
<span class="n">ui</span><span class="p">.</span><span class="n">diff</span><span class="p">.</span><span class="n">tool</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"<name>"</span>
|
||||
<span class="n">diff</span><span class="p">.</span><span class="n">tool</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"<name>"</span>
|
||||
</code></pre></div>
|
||||
<p>The external diff tool can also be enabled by <code>diff --tool <name></code> argument.
|
||||
For the tool named <code><name></code>, command arguments can be configured as follows.</p>
|
||||
|
|
File diff suppressed because one or more lines are too long
Binary file not shown.
Loading…
Reference in a new issue