View | Details | Raw Unified | Return to bug 357336 | Differences between
and this patch

Collapse All | Expand All

(-)gettingStarted/qs-52e.htm (-11 / +24 lines)
Lines 18-51 Link Here
18 
  differences between the two files.</p>
 18 
  differences between the two files.</p>
19 
<p>
 19 
<p>
20 
<img src="../images/Image80_compare_editor.png" alt="Compare editor" border="0" ></p>
 20 
<img src="../images/Image80_compare_editor.png" alt="Compare editor" border="0" ></p>
21 
<p>There are two parts to the compare editor's local toolbar. Move to the next
21 
<p>There are two parts to the compare editor's local toolbar. Move between changes
22 
  or previous change using the right group of local toolbar buttons.</p>
 22 
and differences using the right group of local toolbar buttons.</p>
23 
<blockquote>
 23 
<blockquote>
24 
<p>
 24 
<p>
25 
<img src="../images/Image80_compare_editor3.png" alt="Compare buttons" border="0" ></p>
 25 
<img src="../images/Image80_compare_editor4.png" alt="Compare buttons" border="0" ></p>
26 
</blockquote>
 26 
</blockquote>
27 
<ol>
 27 
<ol>
28 
	<li>
 28 
	<li>
29 
	<p CLASS="Para">Click the <b>Select Next Change</b> button <img
 29 
	<p CLASS="Para">Click the <b>Select Next Difference</b> button <img
30 
		src="../images/next_change_nav.gif" alt="Compare editor next button"
 30 
		src="../images/next_diff_nav.gif" alt="Compare editor next difference button"
31 
		border="0">. Observe how it selects the next difference.</p>
 31 
		border="0">. Observe how it selects the next difference.</p>
32 
	</li>
 32 
	</li>
33 
	<li>
 33 
	<li>
34 
	<p CLASS="Para">Click the <b>Select Next Change</b> button a second time to go
 34 
	<p CLASS="Para">Click the <b>Select Next Difference</b> button again<img
35 
	to the next change.</p>
 35 
		src="../images/next_diff_nav.gif" alt="Compare editor next difference button"
36 
		border="0">. Observe how it selects the first change in this difference.</p>
37 
	</li>
38 
	<li>
39 
	<p CLASS="Para">Click the <b>Select Next Change</b> button <img
40 
		src="../images/next_change_nav.gif" alt="Compare editor next change button"
41 
		border="0">. Observe how it selects the next change.</p>
36 
	</li>
 42 
	</li>
37 
	<li>
 43 
	<li>
38 
	<p CLASS="Para">Click the <b>Select Previous Change</b> button.</p>
 44 
	<p CLASS="Para">Click the <b>Select Previous Change</b> button.</p>
39 
	</li>
 45 
	</li>
46 
	<li>
47 
		<p CLASS="Para">Click the <b>Select Previous Difference</b> button.</p>
48 
	</li>
40 
</ol>
 49 
</ol>
41 
<p>To merge changes from the left file to the right file and vice versa use the
50 
<p>To merge changes from the left file to the right file and vice versa use the
42 
  left group of local toolbar buttons. There are four types of merges that can
51 
 left group of local toolbar buttons.</p>
43 
  be performed:</p>
 52 
 <blockquote>
53 
 <p>
54 
<img src="../images/Image80_compare_editor3.png" alt="Compare buttons" border="0" ></p>
55 
</blockquote>
56 
<p>There are four types of merges that can be performed:</p>
44 
<ul>
 57 
<ul>
45 
  <li>Copy whole document from left to right.</li>
 58 
  <li>Copy whole document from left to right.</li>
46 
  <li>Copy whole document from right to left.</li>
 59 
  <li>Copy whole document from right to left.</li>
47 
  <li>Copy current change from left to right.</li>
 60 
  <li>Copy current difference from left to right.</li>
48 
  <li>Copy current change from right to left.</li>
 61 
  <li>Copy current difference from right to left.</li>
49 
</ul>
 62 
</ul>
50 
<p> Typically the copy whole document actions are used when the entire file on
63 
<p> Typically the copy whole document actions are used when the entire file on
51 
  either the left or right can just be replaced by the contents of the other file.</p>
 64 
  either the left or right can just be replaced by the contents of the other file.</p>

Return to bug 357336