Guiffy is a Diff tool, Merge tool, and Folder compare tool all-in-one. It's cross-platform, comes with a command line interface, and includes an API package. Guiffy recognizes over 150 source file encoding formats. And, Guiffy's Trustworthy 3-way merge, SureMerge, was designed from day 1 to avoid all the problems that plague other 3-way diff based merge tools. Guiffy's Major Features: Implemented entirely in Java with a Swing GUI. Available for: Windows(2000, XP, 2003, Vista), MacOS X (PPC or Intel), Linux(any architecture or distribution), Unix(Solaris, HPUX, AIX, Others), and any Java-enabled platform. Guiffy's Trustworthy 3-way merge tool, called SureMerge, surpasses all other merge tools with its intelligent functionality and ease-of-use. See our SureMerge White Paper which includes test kit files for evaluating 3-way merge tools.