リビジョン | 1d590682a8213062c8ac80ad86df3f185cb6328a (tree) |
---|---|
日時 | 2019-06-29 10:52:33 |
作者 | Takashi Sawanaka <sdottaka@user...> |
コミッター | Takashi Sawanaka |
Merge with default
--HG--
branch : stable
@@ -625,6 +625,52 @@ | ||
625 | 625 | </section> |
626 | 626 | |
627 | 627 | <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> | |
628 | 674 | <title>Filter Comments<indexterm> |
629 | 675 | <primary>filters</primary> |
630 | 676 |