Guiffy is a visual file compare diff tool, folder compare, and merge tool. Its features include the Trustworthy 3-way auto-merge - "SureMerge", In-Line difference highlighting, integrated folder and filetree comparisons, command line interface and API for automation, SCM integrations, and application plug-ins.
Guiffy integrates with the following SCM systems as a value-added plugin: AccuRev, Allfusion Harvest, ClearCase, CMSynergy, CVS, Dimensions, MKS Integrity, Perforce, PVCS, StarTeam, SVN, and Visual Studio Team Foundation Server.
Guiffy is a cross-platform product and adopts the native look and feel on Windows, Linux, OS X, and Unix.