Guiffy is an advanced cross-platform compare/merge. Features 2-way and 3-way smart, "SureMerge", interfaces. Compare and Merge interfaces support Editing and Undo. Guiffy's compare views include Inline diff highlighting. Comes with builtin UNICODE and MBCS support. And, a command line interface for CM/SCM integrations -- Works with CVS, Perforce, SOS, Starbase and many others. Guiffy is integrated and bundled with Seapine's Surround CM.