Guiffy is the advanced cross-platform compare/merge. Features 3-way very smart 'SureMerge'. Guiffy's compare views include Inline diff highlighting. Comes with builtin UNICODE and MBCS support. And a command line interface for CM/SCM integrations. Guiffy also includes integrated Folder/FileTree Compare and Synchronization. Plus, a complete API package is included. Version 6.0 includes: FileTree compare view details, [+] / — FileTree compare 'exploring', performance improvements, and FileTree compare logical navigation.