|
 |
Our customers include:
November 1, 2011
Guiffy 9.6 released:
- SureMerge Promote option
- Save 1st/2nd + Reload Compare
- Improved MacOS X 10.6/7 support
- See
Whats New for more info.
September 1, 2011
Merge tool test cases from our WhitePaper now on Github.
See
Whats New for more info.
August 4, 2011
Two independent research projects found diff3 based merge tools not trustworthy.
See
Whats New for more info.
March 1, 2011
Guiffy 9.4 released:
- SaveAs Unified Diff
- SureMerge "eat a closer" avoidance
- Large files/diffs merging improved
- Diff/Merge improved for ingored lines/blocks
- File/Folder histories improved
- Upgraded Mac FileChooser
- See
Whats New for more info.
Sept. 1, 2010
Guiffy 9.3 released:
- Directory Compare upto 4x faster
- Folder Compare archive files - Zip64 & 7-Zip support
- Java 7 (pre-release) support
- Vista & Windows7 Toolbars improved
- See
Whats New for more info.
June 23, 2010
Guiffy 9.2 released:
- Improved Merge tool Attention(conflict) Views
- New Non-GUI Compare Report tool
Oct. 26, 2009
SureMerge White Paper Rev. 2 released.
"Real World" Test case 6 demonstrates SureMerge's advanced 3-way auto merge tool
"Hybrid Algorithm" solution.
|
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).
|
Guiffy's 3-way Merge Tool - SureMerge™
(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.
|
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.
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.
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.
|
|
|
