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


Guiffy Software
News:

...

August 2, 2016: Lower prices, Guiffy Pro single user $30, Guiffy eXpert single user $60. Multi-user 20% discounts.

April 5, 2016: Guiffy Pro/eXpert 11.4 released.
The 11.4 release includes:
  • File Compare Align Similar Lines.
  • Download installs with 1.8 JRE included.
  • Performance improvements.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 11.4 (458-461).
...<BR>


December 1, 2015: Guiffy Pro/eXpert 11.3 released.
The 11.3 release includes:
  • Windows native (xfiledialog) file/folder dialogs.
  • Changed default to inline diff highlighting char x char.
  • AWT Native FileDialogs on Linux.
  • Enhanced GuiffyReport and GuiffyDiff to support archive file types.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 11.3 (452-457).
...<BR>


September 30, 2015: Guiffy Pro/eXpert 11.2 tested/supported on MacOS X 10.11 (El Capitan).

July 29, 2015: Guiffy Pro/eXpert 11.2 tested/supported on Windows 10.

July 7, 2015: Guiffy Pro/eXpert 11.2 released.
The 11.2 release includes:
  • Patch Preview.
  • Revised % rule for diffs inline highlighting.
  • AWT Native FileDialogs on MacOS X.
  • Accelerated anti-aliasing.
  • Upgraded Installers.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 11.2 (449-451).
...<BR>


March 3, 2015: Guiffy Pro/eXpert 11.1 released.
The 11.1 release includes:
  • New Unified Diff patch tool.
  • New 64-bit Windows shell extension.
  • Improved MouseWheel support.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 11.1 (445-448).
...<BR>


November 10, 2014: Eclipse and NetBeans integration:
Eclipse and NetBeans now support external diff/merge tools. The plugins we developed for integration with Eclipse and NetBeans have been plagued with other plugin dependency dead-ends and/or interface rewrites. Our support for integration with Eclipse and NetBeans going forward is now based on their external diff/merge interfaces. Refer to our Eclipse or NetBeans integration Help pages for further information.


November 3, 2014: Guiffy Pro/eXpert 11.0 released.
The 11.0 release includes:
  • New Toolbars:
    • New green monotone buttons.
    • Text added for most buttons.
  • New Tabbed Panes:
    • Opens Pane for File Compare, Folder Compare, and 2 or 3 way Merge.
    • Options Pane for Ignore, Show, Compare/Merge, Folder Ignore, and Folder Show options.
    • Styles Pane for Font, Color, Styles options.
  • Folder Compare enhancements.
  • New Default Style.
  • MacOS X 10.10 (Yosemite) tested/supported.
  • MacOS X download/install with 1.7 JRE included.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 11.0 (444-).
...<BR>


July 2, 2014: Guiffy Pro/eXpert 10.6 released.
The 10.6 release includes:
  • Performance Improvements.
  • 64-bit extensions, files > 2GB.
  • GuiffyReport CLI & API enhanced to support folder compares.
  • Installer Add-Ons option for CC & PVCS tools.
  • New default font search order: Source Code Pro, Consolas, Menlo, Courier New, Courier.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 10.6 (435-443).
...<BR>


April 28, 2014: Free Image Diff available.
For further information see: Guiffy Image Diff


April 2, 2014: Guiffy Pro/eXpert 10.5 released.
The 10.5 release includes:
  • Image Diff tool.
  • U. I. improvements.
  • Install packages with 64 bit JREs included for Windows and Linux.
  • Compare Report enhancements.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 10.5.
...<BR>


January 2, 2014: Guiffy Pro/eXpert 10.4 released.
The 10.4 release includes:
  • Filter Plugin "processors" to run external diff application.
  • Show Archive filetypes (recursively) Folder Show sub-option.
  • File Save/Replace/Backup options.
  • Install packages updated to include 1.7 JREs.
  • See the Release Notes
Refer to the Support,Bug Reports page for details regarding bugs fixed in 10.4 (427-432).
...<BR>


October 23, 2013: Guiffy Pro/eXpert 10.3 tested/supported on Mac OSX 10.9 (Mavericks).

October 17, 2013: Guiffy Pro/eXpert 10.3 tested/supported on Windows 8.1.

August 1, 2013: Guiffy Pro/eXpert 10.3 released.
The 10.3 release includes:
  • Compare Reports (HTML) Inline Diffs highlighting char by char.
  • Compare Reports (HTML) New embedded Diffs Navigation bars.
  • Reorganized Options menu with Style & Syntax and Settings SubMenus.
  • Java 1.8 (pre-release) support.
Refer to the Support,Bug Reports page for details regarding bugs fixed in 10.3.
...<BR>


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 applications 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 test cases from our WhitePaper now on Github.
The merge 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 applications 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 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 "Hybrid Algorithm" solution.

September 17, 2009: Guiffy 9.0 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 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




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