コミットメタ情報

リビジョン1d590682a8213062c8ac80ad86df3f185cb6328a (tree)
日時2019-06-29 10:52:33
作者Takashi Sawanaka <sdottaka@user...>
コミッターTakashi Sawanaka

ログメッセージ

Merge with default

--HG--
branch : stable

変更サマリ

差分

--- a/Docs/Users/Manual/Configuration.xml
+++ b/Docs/Users/Manual/Configuration.xml
@@ -625,6 +625,52 @@
625625 </section>
626626
627627 <section>
628+ <title>Diff algorithm<indexterm>
629+ <primary>algorithm</primary>
630+ </indexterm></title>
631+
632+ <itemizedlist>
633+ <listitem>
634+ <para><option>default</option> (default): The basic greedy diff
635+ algorithm.</para>
636+ </listitem>
637+
638+ <listitem>
639+ <para><option>minimal</option>: Spend extra time to make sure the
640+ smallest possible diff is produced.</para>
641+ </listitem>
642+
643+ <listitem>
644+ <para><option>patience</option>: Use "patience diff" algorithm when
645+ generating diff.</para>
646+ </listitem>
647+
648+ <listitem>
649+ <para><option>histogram</option>: This algorithm extends the patience
650+ algorithm to "support low-occurrence common elements".</para>
651+ </listitem>
652+ </itemizedlist>
653+ </section>
654+
655+ <section>
656+ <title>Enable indent heuristic<indexterm>
657+ <primary>indent heuristic</primary>
658+ </indexterm></title>
659+
660+ <itemizedlist>
661+ <listitem>
662+ <para><option>Enabled</option> (default):
663+ Enable the heuristic that shifts diff hunk boundaries to make diffs easier to read.
664+ It has no effect if the Diff algorithm is default.</para>
665+ </listitem>
666+
667+ <listitem>
668+ <para><option>Disabled</option> Disable the heuristic.</para>
669+ </listitem>
670+ </itemizedlist>
671+ </section>
672+
673+ <section>
628674 <title>Filter Comments<indexterm>
629675 <primary>filters</primary>
630676
旧リポジトリブラウザで表示