Guiffy is a visual file/folder compare merge utility. It`s features include: 3-way smart merge, ComparEdit(great for finding/moving a bug fix from one version to another), InLine diffs hiliting, Integrated folder/filetree compare, Unicode and MBCS plus over 150 file encoding formats.
Guiffy is accompanied by a Java API package so it can be used as a component in your Java applications.
Plus, a command line interface is included for use in scripts and integration with CM/SCM systems (Including: CVS, Perforce, and StarBase). Guiffy`s 3-way smart merge, called SureMerge, surpasses all other merge tools with its intelligent functionality and ease-of-use.
Here are some key features of "Guiffy":
· Implemented entirely in Java with a Swing GUI. Available for: Windows(98, NT4, 2000, XP, 2003, Vista), Linux(any brand), MacOS(9 or X with Aqua interface), Unix(Solaris, HPUX, AIX, Others), OpenVMS, OS/2, and any Java-enabled platform.
· InstallAnywhere downloads make installation and setup a snap. Windows and Linux downloads are available with a Java Runtime Environment included -- So, even if you don`t have Java on your system, you can easily download and install Guiffy in a single step.
· Help includes introduction documents -- "How Do I..." for getting started and "Have It Your Way..." for popular setup choices. Help package includes Table of Contents, Index, and Search navigation. Help contents cover every aspect of Guiffy --- the G.U.I. and every operation`s options, the command line interface and CM/SCM integrations, and the API package.
· Guiffy`s Trustworthy 3-way merge tool called SureMerge automatically goes beyond the focus on "conflicts" in other merge tools. Guiffy`s "Attention" focus can be expanded by the user. And, SureMerge`s heuristic algorithms result in fewer, easier to resolve changes. Plus, a Parent Attention view is available for when it helps to see or copy parts of "the way it was before".
· Guiffy`s Diff tool ComparEdit features are very handy for when you need to find a change made in one version of a file and include it in the other --- maybe a bug fix.
· Our Merge tool supports 2-way or 3-way merge operations with views of both compare/merge files and the merge result. Guiffy`s MergEdit interface supports editing-in-place while merging. Navigation through remaining "Attention" changes is automatic or user-directed. Each change can be resolved with a single click and reversed as well. Tools to Keep or Undo All changes are handy for beginning a merge with all the changes from one version --- then, find and keep what you need from the other version.
· Guiffy includes an integrated Folder compare capability. From the Folder Compare Tree view, a double-click quickly does a file compare in another window. And, a right-click brings up a menu of choices for merging, copying, or deleting, etc.
· Guiffy`s command line interface supports scripted automation and integration with CM/SCM systems that work with 3rd party compare/merge tools. AccuRev, Allfusion Harvest, ClearCase, CMSynergy, CVS, Dimensions, MKS Integrity, Perforce, PVCS, StarTeam, Subversion, and Visual Studio Team Foundation Server users find Guiffy SureMerge to be a very valuable plugin.
· VS and Subversion integration support includes as external diff and 3-way merge tool and/or as "conflict editor" (Merge -> Open CVS conflict file).
· Clickon 2 files or folders in Windows Explorer, MacOSX Finder, or Linux KDE and right click to run Guiffy for a quick compare. Guiffy also supports DragNDrop --- drag a file or folder from your desktop file manager to Guiffy`s Open Combo panel.
· With the guiffy.inside API package you can build Guiffy into your applications, applets, or servlets. Interfaces for running the Guiffy GUI in a separate window (Frame) or within your application window (Panel) are available. Engines for running the file compare, quick verifiers, folder/file compare, 3-way merge, and for generating compare reports in HTML are provided as well for non-GUI, or server-side applications.
· Guiffy`s Java-based technology goes way beyond simple ASCII text files and includes support of: UTF8, UTF16, Big5, JIS, Shift-JIS, and EBCDIC (just to name a few). And, the encoding format can be specified separately for each file. Plus, an optional Auto-Mode will detect the Encoding format for you.
· You can compare/merge and edit source files with text from all over the world. You`re in good hands with Guiffy`s Java-based UNICODE support and fonts such as Bitstream Cyberbit or Arial Unicode MS. And, Guiffy`s folder/file tree compare views and file/folder dialogs support Unicode file and folder names.
Limitations:
· 21 days trial.
· Restricted to 321 lines per file. A temporary registration key file will eliminate this restriction for the evaluation period.
What`s New in This Release: [ read full changelog ]
· 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 -...
