<listitem>
<para>Specifies the folder, file or project file to open on the right side.</para>
- <para>WinMerge cannot compare files to folders, so both path parameters
- (<option><replaceable>leftpath</replaceable></option> and
+ <para>WinMerge cannot compare files to folders, so the path parameters
+ (<option><replaceable>leftpath</replaceable></option>,
+ <option><replaceable>middlepath</replaceable></option> and
<option><replaceable>rightpath</replaceable></option>) must point to the
same target type (either folders or files). If WinMerge cannot find either
of the specified paths, it opens the Select Files or Folders dialog, where
in its context menu or press <keycap>F2</keycap>. Then change the name in
the edit box and press <keycap>Enter</keycap>, or press
<keycap>Esc</keycap> to cancel. You can only rename a single file or
- folder. Note that renaming changes items in both sides: it is not
+ folder. Note that renaming changes items in both or all three sides: it is not
currently possible to rename an item on just one side.</para>
</section>
<variablelist>
<varlistentry>
- <term>Browsing a single subfolder that exists on both sides</term>
+ <term>Browsing a single subfolder that exists on both or all three
+ sides</term>
<listitem>
- <para>To compare a single subfolder that exists on both sides,
- double-click the folder in the folder compare window.</para>
+ <para>To compare a single subfolder that exists on both or all three
+ sides, double-click the folder in the folder compare window.</para>
</listitem>
</varlistentry>
</variablelist>
<term>Browsing a single subfolder that exists only one side</term>
<listitem>
- <para>If you browse to a subfolder that exists only the left or
- right side, WinMerge can create a new, matching folder on the other
- side. See <xref linkend="CompareDirs_browse_unique" /> for
- details.</para>
+ <para>If you browse to a subfolder that exists only one side,
+ WinMerge can create a new, matching folder on the other side
+ respective both other sides. See
+ <xref linkend="CompareDirs_browse_unique" /> for details.</para>
</listitem>
</varlistentry>
</variablelist>
<itemizedlist>
<listitem>
- <para><guilabel>Filename (default)</guilabel>: Name of compared item.
+ <para><guilabel>Filename</guilabel>: Name of compared item.
In a nonrecursive compare, this column includes both files and
folders; in a recursive compare, it does not include folders: instead,
folders are listed in the Folder column.</para>
<para>This section describes how to navigate and select differences in the
File Compare window. Note that when you select a difference, it is always
- selected in both File panes.</para>
+ selected in both or all three File panes.</para>
<tip>
<para>To save time, enable <guilabel>Automatically scroll to first
<keycap>Alt</keycap>
<keycap>Right</keycap>
- </keycombo> ( or <keycap>Right</keycap> in merge mode), context
+ </keycombo> (or <keycap>Right</keycap> in merge mode), context
menu in File pane within a difference, and in Diff pane.</para>
</listitem>
</varlistentry>
<listitem>
<para>Copies the current difference from the right to the left File
- pane. See <command>Copy Righ</command>t description for
+ pane. See <command>Copy Right</command> description for
details.</para>
<para>Shortcuts: <inlinemediaobject>
Threshold</emphasis> which helps to ignore color differences.</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term>Ins/Del Detection</term>
+ <listitem>
+ <para>TBD</para>
+ <itemizedlist>
+ <listitem><guilabel>None</guilabel></listitem>
+ <listitem><guilabel>Vertical</guilabel></listitem>
+ <listitem><guilabel>Horizontal</guilabel></listitem>
+ </itemizedlist>
+ <para></para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</section>
<itemizedlist>
<listitem>
<para><option>Enabled</option> (default): The Select Files or Folders
- dialog checks both paths as you enter them. The
- <guibutton>Compare</guibutton> button remains disabled until both paths are
- validated. Note that this checking can cause some delay.</para>
+ dialog checks both or all three paths as you enter them. The
+ <guibutton>Compare</guibutton> button remains disabled until both or
+ all three paths are validated. Note that this checking can cause some
+ delay.</para>
</listitem>
<listitem>
<para>Use this field to specify your own private folder for file filters.
By default this folder is your user profile directory (for example,
- <filename>My Documents</filename> on Windows XP, or
- <filename>Documents</filename> on Windows Vista). When you create a file
+ <filename>Documents</filename> on Windows 10). When you create a file
filter, it is automatically added to this folder.</para>
</section>
<listitem>
<para>The location of this folder is defined in the System page of
WinMerge options. By default, it is specified as a subfolder in your
- user profile folder (for example, <filename>My
- Documents\WinMerge\Filters</filename> in Windows XP). Filters that
- are created or copied here are normally visible only to you. If you
- create new file filters, you can copy them here to keep them
- private.</para>
+ user profile folder (for example, <filename>Documents</filename> in
+ Windows 10). Filters that are created or copied here are normally
+ visible only to you. If you create new file filters, you can copy
+ them here to keep them private.</para>
</listitem>
</varlistentry>
</variablelist>
<para>You control where your merge result is preserved. The WinMerge File
Compare window does not have a separate result pane, as some merge tools
- do. So the simplest strategy is to save your changes to one or both source
- files. Press <keycombo>
+ do. So the simplest strategy is to save your changes to one, two or three
+ source files. Press <keycombo>
<keycap>Ctrl</keycap>
<keycap>S</keycap>
- </keycombo> at any time to save the current changes to both files;
- alternatively, click <menuchoice>
+ </keycombo> at any time to save the current changes to all files;
+ alternatively, click <menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Save Left</guimenuitem>
+ </menuchoice>, <menuchoice>
+ <guimenu>File</guimenu>
+
+ <guimenuitem>Save Middle</guimenuitem>
</menuchoice> or <menuchoice>
<guimenu>File</guimenu>
</menuchoice>. For example, your target file might be the difference or
conflict file generated by a version control system.</para>
- <para>Similarly, in the WinMerge command line, you can leave both source
- versions unchanged by using the optional <option>outputfile</option>
- argument, as described in <xref linkend="Command_line" />.</para>
+ <para>Similarly, in the WinMerge command line, you can leave both or all
+ three source versions unchanged by using the optional <option>outputfile
+ </option> argument, as described in <xref linkend="Command_line" />.
+ </para>
</section>
</section>
</article>
<para>WinMerge is an <ulink url="https://opensource.org/">Open
Source</ulink> differencing and merging tool for Windows. WinMerge can compare
- both folders and files, presenting differences in a visual text format that is
- easy to understand and handle.</para>
+ two or three folders and files, presenting differences in a visual text format
+ that is easy to understand and handle.</para>
<para>WinMerge is highly useful for determining what has changed between
project versions, and then merging changes between versions. WinMerge can be
</itemizedlist>
<tip>
- <para>Press <keycap>Control</keycap> while selecting the
+ <para>Press <keycap>Ctrl</keycap> while selecting the
<guimenuitem>WinMerge</guimenuitem> or
<guimenuitem>Compare</guimenuitem> shortcut in the Windows Explorer
context menu to force a reverse comparison with the current 'Include Subfolders' settings.</para>
opened.</para>
<para>By default, WinMerge does include subfolders in compare
- operations. To not include subfolders, press and hold <keycap>Control</keycap>
+ operations. To not include subfolders, press and hold <keycap>Ctrl</keycap>
while dropping paths. Another useful key when dropping paths is
<keycap>Shift</keycap>: To open the same path in both sides of a Compare
window, press and hold <keycap>Shift</keycap> while dropping only one path.
<guimenuitem>Open Project</guimenuitem>
</menuchoice>. WinMerge reads the paths from the project file. If the
- project file has two paths, both paths are opened. If only one path is
- given or one of paths is invalid, WinMerge opens the Select Files or
- Folders dialog, where you can add or correct the path information. Here
- are a few things to consider:</para>
+ project file has two or three paths, two respective three paths are
+ opened. If only one path is given or one of paths is invalid, WinMerge
+ opens the Select Files or Folders dialog, where you can add or correct the
+ path information. Here are a few things to consider:</para>
<itemizedlist>
<listitem>
OSDN Git Service
