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


Guiffy Software
News:

...

November 1, 2012: Guiffy Pro/eXpert 10.2 released.
The 10.2 release includes:
  • Folder Compare Ignore SubFolders and Ignore Files options improved. Wildcard prefix/suffix patterns supported such as: *Dialog.java or .#*
  • Installer updated with support for Windows 8 and Server 2012.
Refer to the Support,Bug Reports page for details regarding bugs fixed in 10.2.
...<BR>


September 1, 2012: Guiffy Pro/eXpert 10.1 released.
The 10.1 release includes:
  • Improved 3-way SureMerge Attention alignment. Improvements to detect and improve alignment for more cases of "Eat an Opener" or "Eat a Closer".
  • MacOS X 10.8 Gatekeeper install support. Installer App signed with Apple Developer ID.
Refer to the Support,Bug Reports page for details regarding bugs fixed in 10.1.
...<BR>


May 1, 2012: NEW Guiffy Pro/eXpert pricing:
  • Pro file & folder compare pricing:
    • Single user license $37.50
    • Multi user 3for2 discounts: 3 user licenses $75 ($25 / user)
  • eXpert (with SureMerge, API, SCM integrations, IDE plugins, and CLI tools) pricing:
    • Single user license $75.00
    • Multi user 3for2 discounts: 3 user licenses $150 ($50 / user)

May 1, 2012: Guiffy Pro/eXpert 10.0 released.
The 10.0 release includes:
  • Pro and eXpert versions & pricing:
    • eXpert version includes:
      • 2/3-way SureMerge.
      • Guiffy.Inside API.
      • All SCM integration applications.
      • Eclipse and NetBeans plugins.
      • Command line tools: GuiffyReport, SureMerge, and Jiff.
    • Reorganized Toolbars - separate Merge toolbar.
  • Filter Plugins:
    • User defined and configured Filter Plugins for file compare and/or merge.
    • Built-in, Pre-tested examples with download/install documentation in Tech Note 5.
  • Native (SWT) file/folder open/save dialogs.
    • Download/Install packages for Windows, MacOS X, and Linux.
    • Uses Swing component when SWT not installed/configured.
  • Updated Help with Tech Note 5 for Filter Plugins and Tech Note 6 for Native SWT dialogs.
  • Upgraded to InstallAnywhere 2011 SP3 - improved installers and application launchers.
Refer to the Support,Bug Reports page for details regarding bugs fixed in 10.0.
...<BR>


November 1, 2011: Guiffy SureMerge 9.6 released.
The 9.6 release includes:
  • SureMerge Promote option:
    • SureMerge Promote option adds intelligence to SureMerge which will auto merge changes that would be treated as an Attention (conflict) otherwise. The following scenario is a Promote merge case: Branch A(1st file) is being "promoted" to Branch B(2nd file). Branch B is a child of (originally based on) Branch A. Originally Branch A (and Branch B) inserted 2 lines of code after line 26. Branch A is updated adding another line to the lines previously added after line 26. The SureMerge Promote recognizes this case and automatically merges the additional line inserted. 3-way merge tools without a promote option will treat such changes as a conflict requiring manual user resolution.
  • Save 1st/2nd + Reload Compare - File menu operations added to Save 1st or 2nd file and then Reload Compare. Shortcuts Ctrl 6 and Ctrl 7 added.
  • MacOS X 10.6/7 Finder integration - Help doc updated with information on how to build a Services menu Finder integration workflow with Automator.
  • MacOS X 10.7 scrollmeters scaled - adjusts offsets to allow for no scroll buttons.
  • Encoding Auto Mode made default.
  • Upgraded to InstallAnywhere 2011 SP2 - improved installers and application launchers.
Refer to the Support,Bug Reports page for details regarding bugs fixed in 9.6 ( 418 - 420).
...<BR>


September 1, 2011: Merge tool test cases from our WhitePaper now on Github.
The merge tool test cases from our WhitePaper are available in a reposistory on Github. Thanks goes to Forrest Norell for creating the repository on Github at: Merge test cases on Github



August 4, 2011: Two independent research projects found diff3 based merge tools not trustworthy.
The first study published in 2007 was supported by NSF grants and researched the behavior of the diff3 algorithm. The researchers were "surprised" to find how unpreditcatble diff3 can be: A Formal Investigation of Diff3

The second project from 2010 actually employed black box testing and found the diff3 based merge in Eclipse to be correct in only 86% of the test cases: Testing Eclipse Compare's Algorithm for Three-way Merging



July 27, 2011: Guiffy SureMerge 9.4 tested/supported on MacOS X 10.7 (Lion).
We have a newer MacMini. Its fully loaded with 4GB of RAM and a 500GB 7200 RPM HD. We partitioned the HD for future OS X releases. After dowloading and installing 10.7 on one of the partitions, we downloaded and installed Guiffy 9.4. The Guiffy installer detected there isn't a Java Runtime installed with 10.7, displays a dialog asking if you'd like to install a Java Runime, then it downloads and installs a Java 1.6 runtime for OS X 10.7, and resumes the the install. Guiify 9.4 runs and operates on 10.7 (Lion) just fine.



March 1, 2011: Guiffy SureMerge 9.4 released.
The 9.4 release includes:
  • SaveAs Unified Diff. Replaces SaveAs RCS Diff. Supports specifying number of Context lines, EOL formats, & Encoding format. Jiff non-GUI command line utility -u option added to generate Unified Diff. GuiffyDiff non-GUI API class - setUnified method added to generate Unified Diff.
  • SureMerge "eat a closer" avoidance: Detects matching line(s) at the end of conflicting inserts, Keep Both avoids loosing any of those matching lines. Implemented in GUI application and APIs & SureMerge non-GUI (automation and server-side) application and API.
  • SureMerge algorithms improved for large files and differences.
  • SureMerge improved processing with options for Ignored lines/blocks.
  • File and Folder history lists avoid duplicate path entries. Parent File history list for SureMerges preserved when merge results saved to different path.
  • File and Folder dialogs remember last path used - corrected/improved/extended.
  • Upgraded Quaqua FileChooser for latest Snow Leopard LAF on MacOS X.
  • Upgraded to JavaHelp 2 - improved search and performance.
  • Upgraded to InstallAnywhere 2010 - improved installers and application launchers.
Refer to the Support,Bug Reports page for details regarding bugs fixed in 9.4 ( 412 - 417).
...<BR>


September 1, 2010: Guiffy SureMerge 9.3 released.
The 9.3 release includes:
  • Folder Compare performance improved - upto 4x faster. The Verify files match using Text verify (default) is enhanced to automatically detect binary files and switch to the binary (Byte-by-byte) verify method.
  • Folder Compare archive files improved - added support for Zip64 and 7-Zip formats.
  • Keep/Undo All tool imrpoved. KeepUndoAll action method added in the GuiffyPanel class of the API. Keep and Undo All actions fixed to avoid issues that were hanging the UI on subsequent editing operations.
  • Java 7 (pre-release) support - Guiffy runtime checks for Java runtime versions updated to recognize 1.7.
  • Vista and Windows 7 Toolbars improved - removed the button border decorations.
Refer to the Support,Bug Reports page for details regarding bugs fixed in 9.3 ( - 411).
...<BR>


June 23, 2010: Guiffy SureMerge 9.2 released.
The 9.2 release includes:
  • Improved Attention Views - Compare views for Parent vs 1st or 2nd added for during 3-way auto merges. Context (right click, popup) menu items added to open compare views showing the Parent vs 1st or 2nd file for the current Attention.
  • Improved SureMerge resolutions - 3-way auto merge algorithms improved to avoid "Confused" cases and reduce the number of Attentions (also known as Conflicts).
  • GuiffyReport utility - nonGUI compare report tool generates HTML compare reports.
  • Open Evaluations - without email. Fully enabled 21-day evaluations without a temporary license key or email required. Temporary license keys still available for extended (beyond 21 days) evaluations.
  • Installers and Launchers upgraded
Refer to the Support,Bug Reports page for details regarding bugs fixed in 9.2 (409 - 410).
...<BR>


February 6, 2010: Guiffy SureMerge 9.1 released.
The 9.1 bug fix release includes upgraded install and launcher packages for MaxOS X 10.6 (Snow Leopard) and Windows 7 support.

Refer to the Support,Bug Reports page for details regarding bugs fixed in 9.1 (396 - 408).
...<BR>

November 2, 2009: Guiffy 9.0 diff/merge tool tested/supported on Windows 7.

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.

September 17, 2009: Guiffy 9.0 diff/merge tool tested/supported on MacOS X 10.6 (Snow Leopard).

August 19, 2009: New Pricing:
  • Lower single-user price - $59.
  • Tiered multi-user discounts.
  • "Renewals" replace "Subscriptions".
  • "Upgrade" policy/pricing for expired licenses.

July 29, 2009: Guiffy SureMerge 9.0 released.

July 1, 2009: Guiffy 9.0 "Birch" beta testing begins...
The 9.0 release will include:
  • Folder Compare - Archive files:
    • Archive files (zip, tar, tgz, tbz2, jar, ear, war) can be compared with folders/file trees. Archive files can be specified for folder compares in the Folder Open panel, in all of Guiffy's command line interfaces, and in the Guiffy API.
  • Diff/Merge tool Syntax Highlighting:
    • File compare view syntax highlighting for over 20 syntax types: (Assembler(x86), C, C++, C#, CSS, Fortran, Groovy, HTML, Java, JavaScript, JSP, Lua, Make, Perl, PHP, Properties, Python, Ruby, SAS, SQL, Tcl, Unix shell scripts, Windows Batch, XML). The file types recognized for a supported syntax can be modified by the user. Highlighting style options include: color, italics, and bold. Syntax elements (each with their own style) include: Comments, Reserved words, Funtions, Literals, Data Types, Variables, Separators, Operators and Preprocessor). The style options for each syntax element can be modified by the user. All the user option settings can be saved and applied in subsequent sessions.
  • User defined keyboard shortcuts:
    • Keyboard Shortcuts for all of Guiffy's actions - menu items and merge buttons can be user defined (more than 80). The user defined shortcuts can be saved and applied in subsequent sessions.
  • Smoother screen shifts during merge operations/navigation
  • Folder compare enhanced for files over 1GB
  • New About dialog with license key path and scrolling credits window
  • Installer upgraded - finds 1.6 JDK/JREs and works with the latest 64 bit platforms
If you'd like to participate in the 9.0 beta tests, just send us an email.

March 28, 2009: 8.6 Build 262 includes several "under the hood" diff and merge tool improvements.
Refer to the Support,Bug Reports page for details regarding bugs fixed in 8.6 Build 262(390 - 394).
...<BR>

January 1, 2009: Guiffy NetBeans plugin beta testing begins...
The Guiffy plugin features include:
  • File compare, Folder Compare, and Merge Tool functions included.
  • Includes integration with CVS and SVN.
  • The plugin uses Guiffy's API --- So, its faster than other Diff tool plugins which execute external commands.
  • The Guiffy plugin is Java based --- So, its available on all NetBeans platforms (not just Windows).
If you'd like to test our new NetBeans plugin, just send us an email. Your feedback will help us make sure the plugin fits the needs of NetBeans users.

October 31, 2008: Guiffy SureMerge 8.6 released.

October 14, 2008: Guiffy 8.6 "Willow" begins beta testing...
The 8.6 release includes:
  • 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
Refer to the Support,Bug Reports page for details regarding bugs fixed in 8.6 (387 - 389).
...<BR>

March 24, 2008: Guiffy SureMerge 8.4 released.

March 3, 2008: Guiffy 8.4 "Sycamore" begins beta testing...
The 8.4 release includes:
  • Eclipse plugin
  • New "Hybrid" SureMerge algorithm
  • Improved compare algorithm
  • Ignore Regular Expression Types for "Part" of line and "Block" of lines
  • Memory Meter toolbar gadget
  • MacOS X improvements
  • CLI & API enhancements.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 8.4 (380 - 383).
...<BR>

December 3, 2007: Systar has signed a license agreement with Guiffy Software to integrate & bundle the Guiffy SureMerge diff tool and merge tool with the upgrade tool for their Business Bridge NG BAM product.

November 2, 2007: Juniper Networks has signed a license agreement with Guiffy Software to integrate & bundle the Guiffy file compare diff tool with their Network Management, NMS product.

October 16, 2007: Guiffy Eclipse plugin beta testing begins...
The Guiffy plugin features include:
  • File compare, Folder Compare, and Merge Tool functions included.
  • Compare with CVS included.
  • Eclipse 3.1, 3.2, and the latest 3.3 supported.
  • 1.4.2_12, 1.5, and the latest 1.6 JDKs supported.
  • Plugin also tested and supported with Rational Application Developer.
  • The plugin uses Guiffy's API --- So, its faster than other Diff tool plugins which execute external commands.
  • The Guiffy plugin is Java based --- So, its available on all Eclipse platforms (not just Windows).
If you'd like to test our new Eclipse plugin, just send us an email. Your feedback will help us make sure the plugin fits the needs of Eclipse users.

September 10, 2007: Guiffy SureMerge 8.2 released.

August 27, 2007: Guiffy 8.2 "Mulberry" begins beta testing...
The 8.2 release includes:
  • Folder Compare Show Option: Verify SubFolders Match:
    • When the folder compare view is not a recursive file tree compare, this option will verify and indicate whether the non-expanded subfolders contents match.
  • MacOS X Improved File Dialogs:
    • With Finder Navigation Links for Network and Mounted drives.
  • Options -> UI Language (runtime).
  • Folder Compares show ignored differences (file/folder name (case), size, date).
  • Warning Dialog on Merge Save with Attentions unresolved.
  • Folder Compares upto 30% faster.
  • CLI & API enhancements.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 8.2 (364 - 379).
...<BR>

August 14, 2007: Integration documentation added for TortoiseSVN and Eclipse via the External diff tool plugin.
See our Integration Notes for further information.


July 10, 2007: Guiffy 8.0(Build 226) BugFix Release Available
Build 226 includes 6 bug fixes: #374 through #379.
Refer to the Support,Bug Reports page for details regarding bugs fixed in Build 226.
...<BR>


June 27, 2007: e-Spirit has signed a license agreement with Guiffy Software to integrate & bundle Guiffy SureMerge with their FIRSTspirit content management system.

FIRSTspirit is a fully compatible Java client/server application for content management of the highest class.  Alongside the convenient Java client, a browser-based Web client is also at users disposal.  The SAP EP Business Package for FIRSTspirit and the Content Integrator for IBM WebSphere Portal ensure that companies with IBM or SAP environments can also use FIRSTspirit to integrate their content effortlessly.  e-Spirit bundles Guiffy Suremerge with their FIRSTspirit content management system to provide state-of-the-art comparison and auto-merge capabilities.


May 20, 2007: Guiffy 8.0(Build 223) BugFix Release Available
Build 223 includes 10 bug fixes: #364 through #373.
Refer to the Support,Bug Reports page for details regarding bugs fixed in Build 223.
...<BR>


March 20, 2007: Subclipse integration with Guiffy SureMerge tested/proven.
Subclipse is an Eclipse plug-in for Subversion and it has an interface for external diff/merge tools. Subclipse project members have tested/proven the interface with Guiffy SureMerge. Here's our Tech Note on how to plug Guiffy into Subclipse.


March 10, 2007: Sofotex rates Guiffy SureMerge 8.0 5 stars.
March 11, 2007: Download3000 rates Guiffy SureMerge 8.0 5 stars.
March 12, 2007: DiffUtils.com judges Guiffy SureMerge 8.0 "the best choice for professional developers".
See all our awards and reviews


March 5, 2007: Guiffy SureMerge 8.0 released.


February 5, 2007: Guiffy 8.0 "Redcedar" begins beta testing...
The 8.0 release includes:
  • Named Saved Settings
  • Auto Encoding format detection
  • Auto EOL format detection
  • Show Ignored differences
  • Improved ClearCase Integration
  • Performance Improvements - 2X Faster
  • Windows Vista Support
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 8.0 (360 - 363).
...<BR>

January 19, 2007: Purchase Guiffy online with PayPal enabled.
Our online store at Kagi.com has added PayPal to their list of payment options.





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