At Guiffy our focus is Advanced Cross-Platform Diff/Merge software. Our product is a visual diff tool, merge tool, and folder compare tool that makes comparing and merging sources easy and reliable. Guiffy is used around the world by thousands of professional organizations on a wide variety of platforms (Including: Windows, MacOS X, Linux, and Unix).