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

Featured Partner:  Seapine   

 
Welcome to Guiffy Software Jolt Award

Our customers include:
Guiffy diff/merge Customers

June 23, 2010
Guiffy 9.2 released:
  • Improved Merge tool Attention(conflict) Views
  • Improved Merge tool Attention(conflict) resolutions
  • New Non-GUI Compare Report tool
  • Open Evaluations - without email
  • See Whats New for more info.

February 6, 2010
Guiffy 9.1 released:
  • Upgraded installer for MaxOS X 10.6 (Snow Leopard) and Windows 7 support
  • Bug fixes 396-408

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


July 29, 2009
Guiffy 9.0 "Birch" released.
9.0 includes:
  • Folder Compare: Archive files
  • Diff/Merge tool Syntax Highlighting
  • User defined keyboard shortcuts
  • Merge tool - smoother screen shifts
  • See Whats New for more info.

October 31, 2008
Guiffy 8.6 "Willow" released:
  • Diff tool Manual Alignment
  • Eclipse plug-in SVN support
  • Diff/Merge tool and Folder Compare Anti-Aliasing
  • Diff tool Copy/Replace + Next Change
  • See the Release Notes

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

                     Download Now
  • 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 9.0 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 --->>>
    diff tool Syntax
  • 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.
    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 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.
    more Folder Compare info...
    <<<--- Clickon thumbnail to view the screenshot
  • 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.
    <<<--- Clickon thumbnail to view the screenshot
  • 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.

Guiffy's 3-way Merge Tool - SureMerge™

diff/merge tool
on Windows 7 (245 KB)
3-way merge on MacOS X 10.6
on MacOS X 10.6 (208 KB)
SureMerge on Linux
on Linux (80 KB)
(Clickon the above thumbnails to view the screenshots)


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


  Home |  Contact Us |  Legal |  Privacy |  Site Map     Copyright © 2010 Guiffy Software, Inc. All rights reserved.