Skip to content

Commit

Permalink
Update Add "Ignore missing trailing EOL" option to Compare settings (#…
Browse files Browse the repository at this point in the history
…2573) (3)
  • Loading branch information
sdottaka committed Dec 25, 2024
1 parent de5988e commit d7bd7e2
Show file tree
Hide file tree
Showing 4 changed files with 763 additions and 675 deletions.
23 changes: 23 additions & 0 deletions Docs/Manual/English/Configuration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,29 @@
</itemizedlist>
</section>

<section>
<title>
Ignore missing trailing EOL<indexterm>
<primary>filters</primary>
<secondary>EOL</secondary>
</indexterm>
</title>

<itemizedlist>
<listitem>
<para>
<option>Disabled</option> (default): Differences in the presence or absence of trailing EOL characters are detected as differences, even if the content of the lines matches.
</para>
</listitem>

<listitem>
<para>
<option>Enabled</option>: When one file ends with an EOL character (e.g., LF or CRLF) and the other does not, but the line content matches, these differences are ignored.
</para>
</listitem>
</itemizedlist>
</section>

<section>
<title>
Enable moved block detection<indexterm>
Expand Down
21 changes: 21 additions & 0 deletions Docs/Manual/Japanese/Configuration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,27 @@ BOMの有無の違いも検出します。</para>
</itemizedlist>
</section>

<section>
<title>
ファイル末尾の改行文字の有無を無視する<indexterm>
<primary>フィルター</primary>
<secondary>EOL</secondary>
</indexterm></title>

<itemizedlist>
<listitem>
<para>
<option>無効</option> (デフォルト): 行の内容が一致していても、ファイル末尾の改行文字の有無の違いは無視されません。</para>
</listitem>

<listitem>
<para>
<option>有効</option>:
一方のファイルが改行文字(LFやCRLFなど)で終了しているがもう一方のファイルが改行文字で終了していない場合でも、行の内容が一致していれば、この差異は無視されます。</para>
</listitem>
</itemizedlist>
</section>

<section>
<title>
移動ブロックの検出を有効にする<indexterm>
Expand Down
Loading

0 comments on commit d7bd7e2

Please sign in to comment.