### Eclipse Workspace Patch 1.0 #P org.eclipse.platform.doc.user Index: gettingStarted/qs-52e.htm =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.platform.doc.user/gettingStarted/qs-52e.htm,v retrieving revision 1.26 diff -u -r1.26 qs-52e.htm --- gettingStarted/qs-52e.htm 27 May 2009 12:41:08 -0000 1.26 +++ gettingStarted/qs-52e.htm 30 Sep 2011 09:46:12 -0000 @@ -18,34 +18,47 @@ differences between the two files.

Compare editor

There are two parts to the compare editor's local toolbar. Move to the next - or previous change using the right group of local toolbar buttons.

There are two parts to the compare editor's local toolbar. Move between changes +and differences using the right group of local toolbar buttons.

-
+

-
Click the Select Next Change button Click the Select Next Difference button . Observe how it selects the next difference.
-
Click the Select Next Change button a second time to go - to the next change.
+
Click the Select Next Difference button again. Observe how it selects the first change in this difference.
+
+
Click the Select Next Change button . Observe how it selects the next change.
Click the Select Previous Change button.
+
Click the Select Previous Difference button.
+

To merge changes from the left file to the right file and vice versa use the - left group of local toolbar buttons. There are four types of merges that can - be performed:

+ left group of local toolbar buttons.

+
+
+

There are four types of merges that can be performed:

Copy whole document from left to right.
Copy whole document from right to left.
Copy current change from left to right.
Copy current change from right to left.
Copy current difference from left to right.
Copy current difference from right to left.

Typically the copy whole document actions are used when the entire file on either the left or right can just be replaced by the contents of the other file.