Download User Manual, Version 3.3

Transcript
Release Notes
of installer. This can be used to run DiffMerge from portable drives or on systems where you don't have
administrator access.
DiffMerge.exe looks for the various help files in the same directory as the .EXE, so for best results, please
maintain the package directory structure and run DiffMerge.exe from the package directory.
Please note that this version uses the registry (HKCU only) to store per-user configuration information,
last window geometry, recently used files, and etc. So it does not completely satify the portable application
[http://en.wikipedia.org/wiki/Portable_application] definition; but this is a first step.
Release 3.0.0 - June 2007
This is the initial release of SourceGear DiffMerge 3.0 [http://www.sourcegear.com/diffmerge/
index.html]. This is the first version of a new application to visually compare and merge files and to
compare folders. It runs on Windows, Mac OS X, and Linux. This is the first version to be released
as a FREE [http://www.sourcegear.com/diffmerge/downloads.html] stand-alone utility application. It is
also bundled with SourceGear Vault 4.0 [http://www.sourcegear.com/vault/index.html] and SourceGear
Fortress 1.0 [http://www.sourcegear.com/fortress/index.html].
This is a new implementation of diff/merge functionality and is based upon the wxWidgets [http://
www.wxWidgets.org] library.
This version replaces a previous Windows-only implementation that was shipped with SourceGear Vault
3.5.
This version recognizes the same command line arguments as the previous version and can be used
with Vault 3.5 by simply installing the Windows stand-alone version and changing the pathnames in the
Program fields in the Diff/Merge section of the Vault options dialog.
File Diff and Merge Window Features:
• Graphically shows interline and intraline differences between two or three files.
• Allows changes between files to be interactively applied using keyboard and mouse.
• Suports automatic three-way merge (when safe to do so) of changes between two branched file versions
into common ancestor version.
• Unlimited undo/redo of all edits.
• Displays tabs as 2, 4, or 8 spaces to save screen space.
• Supports extensize customization of colors used to display files and changes.
New file window features in this version not available in previous version:
• Supports full interactive editing of files in addition to applying patches.
• Offers three display modes: everything, differences only, and differences with context.
• Supports file printing (and print preview) in all three display modes.
• Offers two views of files when editing: the currently edited version and a reference view of the files
as originally loaded.
• Supports 'Display Invisibles' feature to show whitespace and end-of-line (EOL) characters.
86