C:\tmp\stable.75.5259\Docs\Users\Manual\Compare_dirs.xml C:\tmp\stable.75.5260\Docs\Users\Manual\Compare_dirs.xml
1<?xml version="1.0" encoding="UTF-8"?>  1<?xml version="1.0" encoding="UTF-8"?> 
2<article id="CompareDirs">  2<article id="CompareDirs"> 
.3  <title>Comparing folders<indexterm>  3  <title>Comparing and merging folders<indexterm> 
4      <primary>comparing folders</primary>  4      <primary>comparing folders</primary> 
5    </indexterm></title>  5    </indexterm></title> 
6  6 
7  <para>This topic describes how to compare and merge folders using the Folder 7  <para>This topic describes how to compare and merge folders using the Folder
8  Compare window.</para>  8  Compare window.</para> 
9  9 
.10  <section>  10  <section id="Compare_dirs_starting"> 
11    <title>Starting a folder compare operation</title>  11    <title>Starting a folder compare operation</title> 
12  12 
13    <para>You can begin a folder compare operation from either the WinMerge 13    <para>You can begin a folder compare operation from either the WinMerge
14    window or a Command Prompt window.</para>  14    window or a Command Prompt window.</para> 
15  15 
119      uncompleted results.<!--I'm not able to reproduce the behavior documented in the earlier version of this topic: 119      uncompleted results.<!--I'm not able to reproduce the behavior documented in the earlier version of this topic:
120I get the partial list, but no Abort indicator.--></para>  120I get the partial list, but no Abort indicator.--></para> 
121    </section>  121    </section> 
122  </section>  122  </section> 
123  123 
.124  <section>  124  <section id="Compare_dirs_window"> 
125    <title>Folder Compare window<indexterm>  125    <title>Folder Compare window<indexterm> 
126        <primary>Folder Compare window</primary>  126        <primary>Folder Compare window</primary> 
127      </indexterm></title>  127      </indexterm></title> 
128  128 
129    <para>The Folder Compare window shows the result of a folder compare in a 129    <para>The Folder Compare window shows the result of a folder compare in a
302      contents by copying, moving, or delete one or more files or 302      contents by copying, moving, or delete one or more files or
303      subfolders.</para>  303      subfolders.</para> 
304    </section>  304    </section> 
305  </section>  305  </section> 
306  306 
.307  <section>  307  <section id="Compare_dirs_multiwin"> 
308    <title>Working with multiple Folder Compare windows</title>  308    <title>Working with multiple Folder Compare windows</title> 
309  309 
310    <para>By default, the WinMerge window displays a single Folder Compare 310    <para>By default, the WinMerge window displays a single Folder Compare
311    window. That is, if you start another file comparison while a Folder Compare 311    window. That is, if you start another file comparison while a Folder Compare
312    window is currently open, the new Compare window replaces the current one. 312    window is currently open, the new Compare window replaces the current one.
313    If you prefer to work with multiple compare operations simultaneously, 313    If you prefer to work with multiple compare operations simultaneously,
314    consider setting (checking) the <guilabel>Enable multiple compare windows 314    consider setting (checking) the <guilabel>Enable multiple compare windows
.315    for Folder compare</guilabel> option. </para>  315    for Folder compare</guilabel> option.</para> 
316  316 
317    <section>  317    <section> 
.318      <title>Using the Tab bar with maximized compare windows</title>  318      <title>Using tabs with maximized Compare windows</title> 
319  319 
320      <para>If you open multiple Compare windows, they are displayed by default 320      <para>If you open multiple Compare windows, they are displayed by default
321      as individually resizeable child windows within the WinMerge window, like 321      as individually resizeable child windows within the WinMerge window, like
322      this:</para>  322      this:</para> 
323  323 
325        <imageobject>  325        <imageobject> 
326          <imagedata contentwidth="569"  326          <imagedata contentwidth="569" 
327                     fileref="screenshots/multifoldercomp1.png" format="PNG" />  327                     fileref="screenshots/multifoldercomp1.png" format="PNG" /> 
328        </imageobject>  328        </imageobject> 
329  329 
.330        <caption><para>Multiple Folder Compare windows: default  330        <textobject> 
331        display</para></caption>  331          <phrase>Multiple Folder Compare windows: default display</phrase> 
  332        </textobject> 
332      </mediaobject>  333      </mediaobject> 
333  334 
334      <para>Often, it's convenient to maximize your Compare window (by clicking 335      <para>Often, it's convenient to maximize your Compare window (by clicking
335      its Maximixe button). The window then fills all the available space in the 336      its Maximixe button). The window then fills all the available space in the
336      WinMerge window. The screen shot below shows a maximized Compare 337      WinMerge window. The screen shot below shows a maximized Compare
340        <imageobject>  341        <imageobject> 
341          <imagedata contentwidth="569"  342          <imagedata contentwidth="569" 
342                     fileref="screenshots/multifoldercomp2.png" format="PNG" />  343                     fileref="screenshots/multifoldercomp2.png" format="PNG" /> 
343        </imageobject>  344        </imageobject> 
344  345 
.345        <caption><para>Multiple Comparison windows: maximized</para></caption>  346        <textobject> 
  347          <phrase>Multiple Folder Compare windows: maximized</phrase> 
  348        </textobject> 
346      </mediaobject>  349      </mediaobject> 
347  350 
348      <para>When you maximize one Compare window, any other Compare windows are 351      <para>When you maximize one Compare window, any other Compare windows are
349      hidden, as shown in the preceding screen shot. To access those windows, 352      hidden, as shown in the preceding screen shot. To access those windows,
350      you could return to the default view by clicking the <inlinemediaobject>  353      you could return to the default view by clicking the <inlinemediaobject> 
371        <imageobject>  374        <imageobject> 
372          <imagedata contentwidth="569"  375          <imagedata contentwidth="569" 
373                     fileref="screenshots/multifoldercomp3.png" format="PNG" />  376                     fileref="screenshots/multifoldercomp3.png" format="PNG" /> 
374        </imageobject>  377        </imageobject> 
375  378 
.376        <caption><para>Multiple Comparison windows: tabbed</para></caption>  379        <textobject> 
  380          <phrase>Multiple Folder Compare windows: tabbed</phrase> 
  381        </textobject> 
377      </mediaobject>  382      </mediaobject> 
378    </section>  383    </section> 
379  </section>  384  </section> 
380  385 
.381  <section>  386  <section id="Compare_dirs_fileops"> 
382    <title>File operations in Folder Compare<indexterm>  387    <title>File operations in Folder Compare<indexterm> 
383        <primary>file operations</primary>  388        <primary>file operations</primary> 
384  389 
385        <secondary>in Folder Compare window</secondary>  390        <secondary>in Folder Compare window</secondary> 
386      </indexterm></title>  391      </indexterm></title> 
610          without paths.</para>  615          without paths.</para> 
611        </listitem>  616        </listitem> 
612      </itemizedlist>  617      </itemizedlist> 
613    </section>  618    </section> 
614  619 
.615    <section>  620    <section id="protectingfiles"> 
616      <title>Protecting files<indexterm>  621      <title>Protecting files<indexterm> 
617          <primary>Folder Compare window</primary>  622          <primary>Folder Compare window</primary> 
618  623 
619          <secondary>protecting files in</secondary>  624          <secondary>protecting files in</secondary> 
620        </indexterm></title>  625        </indexterm></title> 
755      new archive file using one of the <guimenuitem>Zip</guimenuitem>  760      new archive file using one of the <guimenuitem>Zip</guimenuitem> 
756      shortcuts.</para>  761      shortcuts.</para> 
757    </section>  762    </section> 
758  </section>  763  </section> 
759  764 
.760  <section>  765  <section id="Compare_dirs_browsing"> 
761    <title>Browsing folders in the Folder Compare window<indexterm>  766    <title>Browsing folders in the Folder Compare window<indexterm> 
762        <primary>folders</primary>  767        <primary>folders</primary> 
763  768 
764        <secondary>browsing in Folder Compare window</secondary>  769        <secondary>browsing in Folder Compare window</secondary> 
765      </indexterm></title>  770      </indexterm></title> 
955        </listitem>  960        </listitem> 
956      </orderedlist>  961      </orderedlist> 
957    </section>  962    </section> 
958  </section>  963  </section> 
959  964 
.960  <section>  965  <section id="Compare_dirs_customizing"> 
961    <title>Customizing the Folder Compare window<indexterm>  966    <title>Customizing the Folder Compare window<indexterm> 
962        <primary>Folder Compare window</primary>  967        <primary>Folder Compare window</primary> 
963  968 
964        <secondary>customizing</secondary>  969        <secondary>customizing</secondary> 
965      </indexterm></title>  970      </indexterm></title>