http://www.araxis.com/merge/index.html
Merge enables you to compare and work with different
revisions of text files, such as program source code,
XML and HTML files. It supports files with ascii, mbcs
and Unicode character encodings. A colour-coded
side-by-side comparison makes it easy to pinpoint at a
glance similarities and differences between files.
Linking lines are drawn between the documents showing
clearly how they are related.
Point-and-click merging lets you choose the parts of
each file that you would like to add to a final merged
version by simply clicking buttons. The in-place editor
with unlimited undo enables complete control over the
merged file as you create it. The file comparison
display dynamically updates as the merge progresses.
Merge shows detailed highlights of changes within
lines. It can be configured to ignore differences in
whitespace and line endings, as well as changes in
lines matching specified regular expressions. The
latter is useful for ignoring unimportant changes such
as timestamps or expanded version control keywords.
Merge Professional adds advanced three-way visual file
comparison and merging to the Standard Edition's
two-way visual file comparison and merging. This is
particularly useful when more than one person is
working on the same set of files.
Automatic Merging enables swift reconciliation of even
the largest files. Three-way file comparisons can be
launched directly from a three-way folder comparison,
allowing efficient integration of entire branches of
source code.
Merge supports folder hierarchy comparison and
synchronization, enabling you to compare and merge
entire directory trees. This is ideal for detecting
changes in different versions of source code or web
pages. You can even use the efficient byte-by-byte
comparison option to check the integrity of recordable
cds.
The Professional Edition of Merge supports three-way
folder comparison, enabling two revisions of a folder
hierarchy to be merged with their common ancestor or
some other folder hierarchy. This can be especially
useful when used in conjunction with a source code
control or software configuration management system.
An FTP plugin gives Merge file and folder comparisons
direct access to files located on an FTP server. It is
therefore possible to use a folder comparison to
synchronize a local copy of a website.s content with
the main site itself, provided the main site is running
an FTP server.
Merge plugins for Perforce and Visual SourceSafe are
also provided. These give Merge read-only access to
files and folders located in Perforce depots and Visual
SourceSafe databases. Therefore, a Merge folder
comparison can be used to compare a Perforce client
workspace against the depot. Alternatively, different
branches (or the same branch at different points in
time) within a depot can be compared directly. A
similar plugin for AllChange is available from
Intasoft.
File comparison reports (example) can be created in
HTML, HTML slideshow, XML or UNIX diff format. HTML
reports are particularly useful for archiving and
distribution. Folder comparison reports (example) can
be created in HTML or XML format. A folder comparison
report can, optionally, include file comparison reports
for some or all of the files involved in the folder
comparison. Thus it is possible to generate a report
that is a complete record of all the differences in all
of the files involved in a folder comparison. This is
especially useful in code review and code audit
situations, particularly as reports can be generated
directly for files and folders in configuration
management systems for which there is a Merge plugin.
Other features include the ability to print a hard copy
of file and folder comparisons, and to customize the
behaviour and appearance of the application, including
fonts, colours, whether the display is split
horizontally or vertically, and more.
A full Automation API and Command Line Interface are
included, allowing close integration with other
applications (such as source code control and software
configuration management systems) or your workflow.
Comprehensive online documentation is supplied with the
product and is also available from the Araxis web site.
Context-sensitive help is provided for every menu item,
dialog and dialog control.
Download File Size:22.2 MB
|
