Guiffy NetBeans diff merge tool plugin

Install:

Note: The Guiffy plugin requires the NetBeans Developer Collaboration plugin.
The NetBeans Guiffy plugin includes 5 nbm files: To install the plugin from Guiffy's web site:
  1. Go to Tools\Plugins
  2. Go to tab Settings, add new update with name Guiffy and the URL of updates.xml file:
    For NetBeans 6.5.1: http://www.guiffy.com/download/NetBeans92_65/updates.xml
    For NetBeans 6.7.1: http://www.guiffy.com/download/NetBeans92_67/updates.xml
    For NetBeans 6.8: http://www.guiffy.com/download/NetBeans92_68/updates.xml
    For NetBeans 6.9: http://www.guiffy.com/download/NetBeans92_69/updates.xml
    For NetBeans 6.9.1: http://www.guiffy.com/download/NetBeans94_69/updates.xml
    For NetBeans 7.0.1: http://www.guiffy.com/download/NetBeans96_70/updates.xml
  3. Check corresponding checkbox if you want to update Guiffy plugin automatically.
  4. Check as Active Guiffy plugin
  5. Go to Help\Check for Updates (not required If you used update plugin automatically)
  6. Go to tab Available Plugins, select GuiffyNB and press Install.
The Guiffy plugin buttons (below) will appear in the NetBeans toolbar.

Plugin Features:

Guiffy Button Compare files or folders
Choose two files or folders in the Files Window, click Guiffy Compare button and Guiffy performs the file or folder compare.
Guiffy Button 3-way merge, SureMerge.
Choose two files in the Files Window, 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 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 version of the files.
Guiffy Button History.
Shows commit history for selected resource(s).
Documentation by Guiffy Software, Inc. 2012