Guiffy - Diff Merge tool & Folder Compare application and API


	Guiffy Software < The Advanced Cross-Platform Diff/Merge >

Welcome Guiffy: Diff Tool, Merge Tool, Folder Compare

GUIFFY NEWS:

See Whats New for more info.

November 1, 2012
Guiffy 10.2 released:

Improved Folder Compare Ignore options
Windows 8 and Server 2012 install support

September 1, 2012
Guiffy 10.1 released:

Improved 3-way SureMerge Attention alignment
MacOS X 10.8 Gatekeeper install support

May 1, 2012
Guiffy 10.0 released:

File Compare Filter Plugins
Native file dialogs
Reorganized toolbars

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).

free diff tool, merge tool, folder compare download

Guiffy's 3-way Merge Tool - SureMerge™

on Windows 8

on MacOS X 10.8

on Linux

(Clickon the above thumbnails to view the screenshots)

Guiffy's Trustworthy 3-way merge tool, called 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.
more Merge Tool info...

Guiffy's visual diff tool can be used to compare source files of any type

with builtin support of Unicode(UTF8 & UTF16), MBCS, SJIS, and over 150 File Encoding and character set formats.

more Diff Tool info...

<<<--- Clickon thumbnail to view the screenshot

Guiffy implements a blend of 3 diff algorithms to provide the best visual file compare results (including tuneable in-line diffs highlighting) and trusted 3-way auto merge capabilities.

Guiffy's visual diff merge tool includes Syntax Highlighting

with support for over 20 syntax file types builtin (Including: C, C++, C#, CSS, Fortran, HTML, Java, JavaScript, JSP, Perl, PHP, Python, Ruby, SAS, SQL, Tcl, and XML).
Clickon thumbnail to view the screenshot --->>>

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 Directory Compare and a File Compare view is quickly generated in another window.

more Folder Compare info...

<<<--- Clickon thumbnail to view the screenshot

File 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.
<<<--- Clickon thumbnail to view the screenshot

For an expert's In-Depth review of Guiffy SureMerge ... See the product review,
by Austin Hastings.

Plus, Guiffy fits into your environment...

Desktops:
From the Windows Explorer desktop, select files/folders and do compares with Guiffy.
From the MacOS X Finder desktop, select files/folders and do compares with Guiffy.
From a Linux KDE desktop, select files/folders and do compares with Guiffy.

Command Line Interfaces:
Guiffy includes several GUI and non-GUI command line interfaces for automation and integration with your environment. For further information, see the Command Line Interfaces in Guiffy's Help.

Commercial CM systems:
Guiffy has been integrated with with many Commercial CM systems (as a value-added diff merge tool plugin) including: AccuRev, Allfusion Harvest, ClearCase, CMSynergy, Dimensions, MKS Integrity, Perforce, PVCS, StarTeam, and Visual Studio Team Foundation Server. For further information, see these integration notes in Guiffy's Help.

Open Source CM tools:
Choose from a variety of ways to integrate Guiffy with CVS.
SVN Pros use Guiffy SureMerge for all their industrial strength diff merge tool requirements.
Guiffy works great as Git's diff/merge tool.
Guiffy's professional grade diff merge tool works great with Mercurial.
For further information, see these integration notes in Guiffy's Help.

IDEs:
The Guiffy Eclipse plugin performs file or folder compares, 3-way auto merges and also integrates with CVS and SVN.
The Guiffy NetBeans plugin performs file or folder compares, 3-way auto merges and also integrates with CVS and SVN.

API library:
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. For further information, see the Javadocs in Guiffy's Help.