Guiffy eXpert 11.6
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.6 release includes: 1) SureMerge Intelligence improved. 2) Image Diff server mode. 3) Inline Differences highlighting improved.