Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update documentation for "Include unique subfolders contents" setting #2396

Merged
merged 3 commits into from
Jul 28, 2024
Merged

Update documentation for "Include unique subfolders contents" setting #2396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fab2c3
Update default value of "Include unique subfolders contents" setting
vlakoff Jul 28, 2024
cda9b0f
Match position of "Include unique subfolders contents" setting in the…
vlakoff Jul 28, 2024
c26399e
Move default checkbox state to the top of the list
vlakoff Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions Docs/Manual/English/Configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,17 +981,17 @@
<itemizedlist>
<listitem>
<para>
<option>Enabled</option>:
Makes the color of the different lines ignored by line filters and substitution
filters the same as the color of the identical lines.
<option>Disabled</option> (default):
Difference lines ignored by line filters and substitution filters are
displayed in the color of Ignored Difference.
</para>
</listitem>

<listitem>
<para>
<option>Disabled</option> (default):
Difference lines ignored by line filters and substitution filters are
displayed in the color of Ignored Difference.
<option>Enabled</option>:
Makes the color of the different lines ignored by line filters and substitution
filters the same as the color of the identical lines.
</para>
</listitem>
</itemizedlist>
Expand Down Expand Up @@ -1245,30 +1245,6 @@
</itemizedlist>
</section>

<section>
<title>
Include unique subfolders contents<indexterm>
<primary>include unique subfolders</primary>

<secondary>detecting and ignoring differences</secondary>
</indexterm>
</title>

<itemizedlist>
<listitem>
<para>
<option>Disabled</option> (default): WinMerge ignore unique subfolders when comparing folders.
</para>
</listitem>

<listitem>
<para>
<option>Enabled</option>: WinMerge also shows the content from unique subfolders.
</para>
</listitem>
</itemizedlist>
</section>

<section>
<title>
Include subfolders<indexterm>
Expand Down Expand Up @@ -1345,6 +1321,30 @@
</variablelist>
</section>

<section>
<title>
Include unique subfolders contents<indexterm>
<primary>include unique subfolders</primary>

<secondary>detecting and ignoring differences</secondary>
</indexterm>
</title>

<itemizedlist>
<listitem>
<para>
<option>Enabled</option> (default): WinMerge also shows the content from unique subfolders.
</para>
</listitem>

<listitem>
<para>
<option>Disabled</option>: WinMerge ignore unique subfolders when comparing folders.
</para>
</listitem>
</itemizedlist>
</section>

<section>
<title>
Ignore reparse points<indexterm>
Expand Down
54 changes: 27 additions & 27 deletions Docs/Manual/Japanese/Configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,16 +767,16 @@ Completely unhighlight the ignored differences<indexterm>
<itemizedlist>
<listitem>
<para>
<option>Enabled</option>: Makes the color of the different lines ignored by
line filters and substitution filters the same as the color of the identical
lines.</para>
<option>Disabled</option> (default): Difference lines ignored by line
filters and substitution filters are displayed in the color of Ignored
Difference.</para>
</listitem>

<listitem>
<para>
<option>Disabled</option> (default): Difference lines ignored by line
filters and substitution filters are displayed in the color of Ignored
Difference.</para>
<option>Enabled</option>: Makes the color of the different lines ignored by
line filters and substitution filters the same as the color of the identical
lines.</para>
</listitem>
</itemizedlist>
</section>
Expand Down Expand Up @@ -969,27 +969,6 @@ Difference.</para>
</itemizedlist>
</section>

<section>
<title>
片方にしか存在しないフォルダー内も含める<indexterm>
<primary>include unique subfolders</primary>

<secondary>detecting and ignoring differences</secondary>
</indexterm></title>

<itemizedlist>
<listitem>
<para>
<option>無効</option>(デフォルト): WinMerge は、比較時片方しか存在しないサブフォルダーを無視します。</para>
</listitem>

<listitem>
<para>
<option>有効</option>: WinMerge は、片方しか存在しないサブフォルダー内の内容も表示します。</para>
</listitem>
</itemizedlist>
</section>

<section>
<title>
Include subfolders<indexterm>
Expand Down Expand Up @@ -1060,6 +1039,27 @@ folder.</para>
</variablelist>
</section>

<section>
<title>
片方にしか存在しないフォルダー内も含める<indexterm>
<primary>include unique subfolders</primary>

<secondary>detecting and ignoring differences</secondary>
</indexterm></title>

<itemizedlist>
<listitem>
<para>
<option>有効</option>(デフォルト): WinMerge は、片方しか存在しないサブフォルダー内の内容も表示します。</para>
</listitem>

<listitem>
<para>
<option>無効</option>: WinMerge は、比較時片方しか存在しないサブフォルダーを無視します。</para>
</listitem>
</itemizedlist>
</section>

<section>
<title>
再解析ポイントを無視する<indexterm>
Expand Down
Loading