### 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 26 Sep 2011 16:31:45 -0000 @@ -22,25 +22,33 @@ or previous change using the right group of local toolbar buttons.

-Compare buttons

+Compare buttons

  1. -

    Click the Select Next Change button Compare editor next buttonClick the Select Next Difference button Compare editor next difference button. Observe how it selects the next difference.

  2. -

    Click the Select Next Change button a second time to go - to the next change.

    +

    Click the Select Next Change button Compare editor next change button. Observe how it selects the next change.

  3. Click the Select Previous Change button.

  4. +
  5. +

    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.

+
+

+Compare buttons

+
+

There are four types of merges that can be performed: