NO LONGER APPLIES.

Refer to: Eclipse diff merge tool integration.

Eclipse Guiffy Diff/Merge integration

Eclipse is a popular Java/C/C++ IDE. Integration with Eclipse is implemented via plugins. We are implementing a Guiffy plugin for Eclipse. In the meantime, an Eclipse plugin is available for integrating with external diff tools. Follow the steps below to integrate Guiffy with Eclipse using the external diff tool plugin.

External diff tool plugin

Step1. After Eclipse is installed, download the Eclipse external diff tool from http://sourceforge.net/projects/externaldiff
Step2. Install the plugin according to its release notes
Step3. Restart Eclipse
Step4. In Eclipse go to Window->Preferences to open the Preferences dialog
Step5. Select General->Compare/External Tool setting (If you don't see this option, check steps1-3 to ensure the plugin was installed correctly)
Step6. In the Compare/External Tool dialog, click the Browse button next to External diff executable setting and select Guiffy.exe from your Guiffy installation folder
Step7. Click OK to close the preferences dialog
Step8. Now, you can go to various windows in Eclipse and select two files and right-click and choose the Compare With->Each Other (external tool) option. This will launch Guiffy for comparing two files