"Source code is the intellectual property of the company. You have to give it a good home on stable ground. With Surround SCM we don’t worry about losing a file to corruption anymore.
" Michael Lohss Manager, Software Engineering First Choice Health |
|
Guiffy Diff/Merge—Compare Files with Ease
Comparing and merging changes to multiple copies of the same source file is easy with Surround SCM. Surround SCM includes award-winning Guiffy, the leading cross-platform compare/merge utility. With support for over 150 file formats, Guiffy can compare and merge source files of virtually any type. Guiffy also includes sophisticated folder and file tree compare and synchronization capabilities.
SureMerge, Guiffy’s 3-way smart merge surpasses all other merge tools with its intelligent functionality and ease-of-use. Read Guiffy's SureMerge White Paper to learn more about 3-way merge tools.
Major Features:
- Guiffy's Help file 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 GUI and every operation’s options.
- Guiffy's smart 3-way merge, 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.
- Guiffy’s 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.
- 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.
|
- Check out all the ease-of-use features in the User Interface Features list below.
- Choice of 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.
- Guiffy includes an integrated Folder/FileTree 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 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).
|
File Compare/Merge Features:
- Inline Differences are highlighted in reverse video. Controls allow for only showing differences which span less than a specified percentage of the line length and whether to show the differences as a single string or character by character. These options can be switched without re-comparing the files.
- Guiffy’s Compare/Merge Ignore options include: Ignore Case, Ignore Whitespace, Ignore Blank lines, Ignore columns x-y, and Ignore lines matching any Regular Expression (up to 6). Each Ignore option can be applied on compares and/or merges.
- Saved files can be written in any Encoding format.
|
- Compares can be displayed showing the entire files with differences, only the differences, or the differences within the context of n lines.
- Guiffy's default compare algorithm, the Minimum Lines of Diff, is an improved version of the popular "unique anchors" algorithm. SureMerge uses a proprietary heuristic algorithm, Minimum Blocks of Diff. This algorithm can also be applied for compares — and works much better for very large files.
- Guiffy ignores End-of-Line differences. Saved files can be written with any EOL format.
|
Folder Compare Features:
- Folder Compare results can be viewed as a FileTree (the default) or in a text form(more like a detailed directory listing).
- Folder Compare Ignore options include: Ignore Subfolders(list), Ignore Filetypes(list), Ignore Modified Date and Time, Ignore File Size, and Verify files Match (Byte-by-Byte or with Text compare).
Folder Compare Show options include: Show SubFolders recursively, Show Files Matching, Added, Deleted, Changed
|
- Folder Compares can be for one folder at a time(with the ability to drill down) or for an entire filetree at once(recursively).
- Double clicks or right click perform file compares or synchronize operations or 2-3way merges. The compare/merges performed this way are aware of all the file compare/merge options.
- When verifying with text compare whether files match, a quick verify compare is performed which is aware of all the file compare options. Verify compares stop on the first diff.
|
User Interface Features:
- Open both files or folders from one dialog with: history lists, single-click copy/paste, and Browse capabilities.
- Guiffy supports a flexible set of style controls. A built in set of Styles are provided to give you an idea of the possibilities. Color choices for matching. inserted, and deleted text can be combined with background colors for each of those types and change blocks. Font choices can also be setup for each style category.
- Differences can be viewed side-by-side, split horizontally, or together in a single window.
- Guiffy's vertical and horizontal scrolling is synchronized with one set of scrollbars.
- The MouseWheel is supported, AND its scrolling is synchronized.
- Clicking on the scroll meters takes you directly to that point in the view.
- During ComparEdit or MergEdit a full set of Edit menu operations are available including: Copy, Cut, Paste, Undo, and Redo. Plus, special operations for marking lines as removed and flipping the order of changes in a merge block.
|
- Guiffy's user interface includes toolbars for frequently used operations. There are several separate toolbars displayed within a 1 or 2 tier panel depending upon the window's width and which bars are visible.
- Guiffy's MenuBar and MenuChoices accept keyboard Alt-key Shortcuts and Ctrl-key Accelerators.
- A changes choice list is provided for directly navigating to a change block.
- A Find tool is provided for searching the text.
- Navigation tools for next/previous changes and next/previous merge attentions are provided.
- All of Guiffy's Options choices and things like the Guiffy window size and location can be preserved. You can Save the Settings at any time. And Save Settings can be setup to be automatic on Exit.
- Guiffy's user interface is available in Spanish, German, French, and Italian.
|
Other Features
- File and Folder compare together views can be saved as text. File compares can also be saved as an RCS diff text file — for use with patch. And, file compare views can be saved as HTML.
- Saved Merge Files can be opened to resume merging.
- File and Folder compare together views can be printed. Printed reports include page headers and differences are printed in bold.
|
|
