Guiffy Eclipse diff merge tool plugin (GuiffyECSX)

Install:

The plugin archive zip, GuiffyECSX.zip, (http://www.guiffy.com/download/GuiffyECSX.zip) includes 2 files:

features/com.guiffy_ecsx_feature_1.0.6/feature.xml
plugins/com.guiffy_ecsx_plugin_1.0.6.jar

The archived files include a root path "eclipse".

Unpack the archive to a temporary folder.
Copy the 2 folders and files into the Eclipse install folder.
Restart Eclipse.

The Guiffy plugin buttons (below) will appear in the Eclipse toolbar.

Plugin Features:

	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.
	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.
	Compare local version vs. CVS version. Choose file, click Compare with CVS Button and Guiffy Compares local version of selected file with the latest CVS version.
	Replace file(s) with latest CVS version(s). Select one or more files. Click Replace button and selected files are replaced with latest CVS version of the files.
	History. Shows commit history for selected resource(s).