Guiffy eXpert 11.8
This is a visual compare-and-merge tool for Java platforms.
It comes with JavaHelp and InstallAnywhere download kits for installation. The command-line interface supports integration with CM and SCM products. CVS/SVN/Git integration, merge checkpoints and resumption, and folder compare controls are included. 11.8 release includes: 1) Improved Git integration. 2) New default/standard install paths. 3) Improved tabbed dialogs sizing.