A diff tool, merge tool, and folder compare tool all-in-one that makes comparing and merging sources
At Guiffy our focus is Advanced Cross-Platform Diff/Merge software. Our product is a diff tool, merge tool, and folder compare tool all-in-one that makes comparing and merging sources as easy and reliable as possible. Guiffy is used around the world by thousands of professional organizations on a wide variety of platforms (Including: Windows, MacOS X, Linux, and Unix).
* 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.
* Guiffy's diff tool can be used to compare source files of any type
diff/merge Unicode-16
with builtin support of Unicode(UTF8 & UTF16), MBCS, SJIS, and over 150 File Encoding and character set formats.
* Guiffy implements a blend of 3 diff algorithms to provide the best visual file compare results (including tuneable in-line diffs highlighting) and trusted smart merge capabilities.
* Guiffy also provides folder compare and file tree synchronization capabilities.
launch file compares from folder compares
Expand a subfolder... Double-click on a file in Guiffy's Folder Compare and a diff tool Compare view is quickly generated in another window.
* Plus, a command line interface is included for automation and integration with CM systems (as a value-added diff merge tool plugin) including: AccuRev, Allfusion Harvest, ClearCase, CMSynergy, Dimensions, MKS Integrity, Perforce, StarTeam, and Visual Studio Team Foundation Server.
* CVS and SVN Pros use Guiffy SureMerge for all their industrial strength diff merge tool requirements.
* File Compare reports saved as HTML...
compare reports saved as HTML
reflect all of Guiffy's Style (Color and Font) choices and the diff tool results driven by Ignore and Show options.
* And, Guiffy comes with a Java API library, so you can use it as a diff tool, merge tool, and/or folder compare component in your application.
Seapine's Surround SCM and Visible's Razor SCM have licensed Guiffy SureMerge --- so its built-in.