Guiffy features 2-way interactive and 3-way smart, "SureMerge", interfaces.
Merge interfaces support Editing during the merge and Undo. Comes with builtin UNICODE support plus, a command line interface for CM/SCM integrations. Works with CVS, Perforce, and Starbase. Available for all Java-enabled platforms including: Windows, Linux, Unix, MacOS 9/X, and OS/2.
Guiffy 4.0 enhancements include:
* Ignore Regular Expressions
* Ignore Blank Lines
* Java 1.4.0 support
* Ignore FileTypes for Folder compares
* 3-way SureMerge wise enough to merge with Grandparent
Homepage: http://www.guiffy.com
License: 30-day evaluation.
Single User registration is $79.
Thank you for your support,
http://www.guiffy.com
Source: