NO LONGER APPLIES.

Refer to: Eclipse diff merge tool integration.

Guiffy Eclipse diff merge tool plugin (GuiffyECSX)

Install:

The plugin archive zip, GuiffyECSX.zip, (http://www.guiffy.com/download/GuiffyECSX.zip) includes 2 files:
The archived files include a root path "eclipse".
  1. Unpack the archive to a temporary folder.
  2. Copy the 2 folders and files into the Eclipse install folder.
  3. Restart Eclipse.
The Guiffy plugin buttons (below) will appear in the Eclipse toolbar.

Plugin Features:

Guiffy Button Compare files or folders
Choose two files or folders in explorer or navigator view, click Guiffy Compare button and Guiffy performs the file or folder compare.
Guiffy Button 3-way merge, SureMerge.
Choose two files in explorer or navigator view, click SureMerge button, select parent file and Guiffy performs the 3-way auto-merge.
Guiffy Button Compare local version vs. CVS or SVN version.
Choose file, click Compare with CVS/SVN Button and Guiffy Compares local version of selected file with the latest CVS or SVN (Subversive) version.
Guiffy Button Replace file(s) with latest CVS or SVN version(s).
Select one or more files. Click Replace button and selected files are replaced with latest CVS or SVN (Subversive) version of the files.
Guiffy Button History.
Shows commit history for selected resource(s).


Documentation by Guiffy Software, Inc. 2012