Guiffy is a visual source file compare/merge tool implemented entirely in 1.2 Java/Swing. Guiffy features 2-way Interactive and 3-way Smart merging interfaces. It comes complete with full-featured JavaHelp.
Guiffy has been tested and is supported on OS/2 Warp4 running Java 1.1.8 with Swing 1.1.
Release 1.4 features enhancements for SubFolder(recursive) compares and a new Save As RCS diff File command. Release 1.4 includes Spanish and German translated user interfaces. Guiffy's SmartMerge is enhanced in 1.4 to detect difficult compounded conflicts.
License: Fully functional 30-day evaluation.
Single User registration is $49.
Homepage: http://www.guiffy.com
Thank you for your support,
Source: