If you develop software for a living, you know it isn't hard to find free differencing tools. But if you do a lot of diff/merge work, especially across
Guiffy SureMerge is a visual file compare Diff tool, Merge tool, and Folder compare tool all-in-one that makes comparing, merging, and upgrading sources as easy and reliable as possible. Guiffy comes with: command line interfaces, an API package, Eclipse and NetBeans plugins and Explorer integration. Guiffy recognizes over 150 source file encoding formats (such as UTF8, UTF16, and many other multi-byte formats). Advanced visual compare features include in-line difference highlighting and syntax highlighting for more than 20 source code languages. Our Trustworthy 3-way merge, SureMerge, was designed from day 1 to avoid all the problems that plague other 3-way diff based merge tools. SureMerge surpasses all other merge tools with its intelligent hybrid algorithms and ease-of-use. See our SureMerge White Paper which includes test kit files for evaluating 3-way merge tools. Guiffy is implemented entirely in Java with a Swing GUI.
Windows XP/2003/Vista/Server 2008/7/8