Araxis Merge

Mg128

Araxis Merge

99.00€

Advanced two and three-way file comparison (diff), merging and folder synchronization. Compare text, images and binary files. For developers, web designers, legal/publishing professionals and anyone else who works with multiple file revisions.

File Comparison, Merging & More
Merge is the visual file comparison (diff), merging and folder synchronization application from Araxis. Use it to compare and merge source code, web pages, XML and other text files with native application performance. Directly open and compare the text from Microsoft Office (Word and Excel), OpenDocument, PDF and RTF files. Compare images and binary files. Synchronize folders. Perform code reviews and audits. Work with folder hierarchies containing thousands of files. Merge integrates with many SCM (version control) systems and other applications.
Screenshots from left-to-right: folder comparison, 3-way file comparison, image comparison
Merge is available for Mac OS X and Windows. One licence entitles you to use Merge on both platforms. Merge for Mac OS X is fully localized into English and Japanese. The Windows version offers a user interface and online help in English and Japanese .
Instant Overview of File Comparison and Merging
Important file comparison/merging features are indicated in the image and accompanying explanatory text below.
  • Only two-way comparison/merging is shown. The Professional Edition of Merge also supports three-way comparison and merging.
  • The screenshot shows the ribbon user interface that is supported only on newer versions of Windows. Merge has a traditional menu/toolbar interface on older versions of Windows.
Overview of file comparison and merging
1. Folder comparison button on quick access toolbar
Click this button to launch a folder comparison window. Folder comparison windows let you compare and synchronize entire folder hierarchies. Other buttons on this quick access toolbar enable text, binary and image comparisons to be launched with a single click.
2. Report button
Click this button to create a report of the file comparison in HTML, HTML slideshow, XML or UNIX diff format. HTML reports are particularly useful for archiving and distribution.
3. Automatic merge to common ancestor button (Professional Edition only)
Click this button to merge automatically non-conflicting changes from the left and right files into the centre common ancestor file of a three-way comparison.
4. Three-way comparison button(Professional Edition only)
Click this button to change to a three-way file comparison view.
5. Tab strip
The tab strip lets you switch quickly between different file comparisons if you have several open at once.
6. Read-only and file modified indicators
The left icon Indicates that a file is read-only. Read-only files may only be edited if you have configured Merge to allow this.
The right icon indicates that the file has been edited or modified since the comparison was first performed. Note that editing is disabled by default in read-only files, but can be enabled if desired.
7. Move the linking lines panel
Drag the linking lines panel left or right from here to change the relative widths of the file comparison panes. Double click to re-centre.
    
8. Removed block of text
This block of text is present only in the left-hand file. The connecting lines show you exactly where the text would have to be inserted in the right file to make the two files identical.
9. Merging button
Click a merging button to copy a block of text to the other file, replacing any corresponding block. Hold down Ctrl while clicking to insert instead of replacing. Hold Ctrl+Shift and click to delete a block of text.
10. Vertical scrollbar
As you scroll one file, the other is automatically scrolled to keep matching parts of the two files visible. Hold down Ctrl while scrolling to prevent this and only scroll one file.
11. Bookmark
You can set bookmarks in a file to help keep track of important locations as you are editing. Comments can be added to bookmarks, and are included when you save a comparison (perhaps for archiving or sharing with colleagues) and also in HTML comparison reports.
12. Omitted lines indicator
By default, Merge shows all unchanged lines of text. However, it is possible to omit some of the unchanged text to avoid showing irrelevant information.
13. In-place editing
You can edit either file directly in-place. The file comparison automatically updates as you make changes.
14. Overview strip
This gives you an immediate idea of the extent of the differences between the files being compared. Each colour-coded mark on the strip represents a difference. You can click on the overview strip to jump directly to particular change.
15. Centre point marker
Merge tries to keep matching parts of the files aligned with this centre point marker as you scroll vertically.
    
16. Inserted block of text
This block of text is present only in the right-hand file. The connecting lines show you exactly where the text would have to be inserted in the left file to make the two files identical.
17. Edit marker
These show you whether a line has been edited or copied from another file.
18. Insertion point
A thin vertical line indicates where within the line text has been inserted in the other file.
19. Context menu (not shown)
Right-click either file panel to display a context menu containing shortcuts to useful commands. The Explorer context menu for the file is also available from this menu.
20. Block of changed text and in-line highlighting
This block of text is different in the two files. The linking lines show the related block of text in the other file. You can change the font and colours used for blocks of changed text in theOptions dialog.
Notice that only the changed text within the line is highlighted. This enables you to easily pinpoint inserts, removals or changes even in long lines of text.
21. Linking lines
The linking lines connect corresponding parts of the files, showing exactly how they are related.
22. Previous/Next change buttons
Use these buttons to jump quickly between each change in the files.
23. Status bar (including change summary)
The status bar shows the character encoding of the currently selected file and a count of the changes between the files.
File comparison and merging
Two way file comparison. Links to an instant overview of file comparison.Merge enables you to compare and work with different revisions of text files, such as program source code,XML and HTML files. Merge can extract and compare the text from Microsoft Office, OpenDocument, PDF and RTF files. XML files can be shown with special formatting, helping you to see changes more clearly. 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.
Binary and image file comparison
Merge doesn’t just compare text files. Use image comparison to compare various types of image file and instantly see which pixels have been modified. Binary comparison enables you to identify differences in data files at a byte level.
Three-way comparison and automatic merging
Three way file comparison. Links to a larger image.
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.
Integrated folder hierarchy comparison and synchronization
Folder comparison and synchronization. Links to an instant overview.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 verify the contents of recordable CDs or USBthumbsticks.Three way folder comparison. Links to a larger image.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.
Direct access to FTP sites and configuration management systems
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, Subversion, Visual SourceSafe, Mercurial, and Git are also provided. As well as providing access to older versions of the files you are comparing, the plugins make it possible to perform a folder comparison of a local Perforce, Subversion or VSS client workspace against the repository. Alternatively, different branches (or the same branch at different points in time) within a repository can be directly compared. A similar plugin for AllChange is available from Intasoft.
Report generation
File comparison reports (examples: two-way, three-way) can be created in HTML, HTMLslideshow, XML or UNIX diff format. HTML reports are particularly useful for archiving and distribution. Folder comparison reports (examples: two-way, three-way) can be created in HTMLor 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.
Print support, Automation and other advanced features
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 managementsystems) or your workflow.
Comprehensive online documentation is supplied with the product and is also available from the Araxis website. Context-sensitive help is provided for every menu item, dialog and dialog control.
Feature Summary and Differences Between Editions
Merge is available in two editions.
The Standard Edition of Merge is intended primarily for use by individuals.
The Professional Edition is better suited to commercial settings, particularly team environments.
The sole difference between the Standard and Professional editions of Merge is that only the Professional Edition contains features related to three-way comparison and merging.
The tables below summarize the major features in the two editions of Merge. A feature is not present in an edition if there is no text against the feature in that edition’s column.
File comparison and merging
 
Standard/
Professional/
Benefit
File comparison and merging Instant Overview
Yes
Yes
Learn how to compare and merge files with Merge in just a few minutes.
Two-way text comparison andmerging
Yes
Yes
Identify and reconcile insertions, removals and changes between different versions of source code, configuration files, XML documents, web pages or any other text file.
Three-way comparison and merging
 
Yes
Compare and merge changes in two updated revisions of a file with their common ancestor (or any other file). Use to reconcile conflicting changes made to a set of files by multiple developers or to merge branches in a source code control or software configuration management system.
Directly open and compare text from Microsoft Office (Word and Excel), OpenDocument,PDF and RTF files
Yes
Yes
Save time by directly loading and comparing popular file formats. Alternatively, you can copy text from other applications and paste it into a Merge text comparison window.
Special display formatting for XML and XHTML files
Yes
Yes
See changes clearly in even the most densely formatted XML files without sacrificing the fidelity of a true textual comparison.
Binary file comparison
Yes
Yes
Compare binary data files and see differences at the byte level.
Image file comparison
Yes
Yes
Compare various types of image file and see precisely which pixels have been modified.
64-bit Version Available
Yes
Yes
Compare huge files (for example, 100 MB or larger) with the 64-bit version of Merge, able to take advantage of the potentially very large amounts of memory available on 64-bit systems running a 64-bit operating system.
Syntax highlighting
Yes
Yes
Better comprehend a wide range of source files with built-in syntax highlighting.
Reports in HTML, HTML slideshow, XML and UNIX diff format
Yes
Yes
Create reports on file comparisons for archiving, distribution or export to other applications. Annotate HTML reports by adding bookmark comments.
Bookmarks and comments
Yes
Yes
Mark points of interest. Annotate comparisons with comments and questions, before saving as a single-file archive to be emailed to other team members for review.
Single-file comparison archives
Yes
Yes
Save a comparison to a single file for archival or later review, even on a different machine. Saved file comparisons include any bookmarks and associated comments that have been created, making it possible to annotate comparisons with questions and comments, before emailing them to other team members for review.
Comparison statistics window
Yes
Yes
See a summary of the current comparison.
Integrated folder comparison
Yes
Yes
Quickly and efficiently compare and merge all the files changed between different folder hierarchies. Process entire sets or branches of source code, web pages or other text files.
Point-and-click merging
Yes
Yes
Copy inserted, removed or changed blocks of text from one file to another (or delete them) using a single mouse click. Files can be manually merged very quickly.
In-place editing
Yes
Yes
Make fine-grained changes directly to the files being compared in the file comparison window itself. You do not have to open a separate editing window.
Linking lines
Yes
Yes
Related blocks of text are graphically linked enabling you to see at a glance how files are related. Linking lines eliminate the need for blank padding lines to keep corresponding lines adjacent to one another.
Synchronization links
Yes
Yes
Users may add synchronization links to tell Merge to re-synchronize the comparison at particular points. This is particularly useful in some complex comparison scenarios.
Side-by-side or horizontally-split display
Yes
Yes
Display files side-by-side with linking lines or vertically, with one file above the other (useful for files with long lines).
Optional wrapping of long lines
Yes
Yes
See all of the text within each line without having constantly to scroll from side-to-side.
Synchronized scrolling
Yes
Yes
Related parts of files are kept aligned in the vertical centre of the file comparison display as any file is scrolled.
Highlighting of changes within lines
Yes
Yes
Identify at-a-glance inserts, removals and changes made within lines down to the level of individual characters.
Automatic merging
 
Yes
Quickly and safely merge changes in two updated revisions of a file with a common ancestor (or any other file). Automatically merged text is marked with edit markers and any conflicting sections flagged for later manual processing. Automatic merging is an undoable operation, making it safe and easy to try an automatic merge speculatively to see exactly what it will do.
Mark selected lines as resolved
Yes
Yes
Lines marked as resolved are dimmed (in the same way as following an automatic merge). This makes it easy to keep track of the areas of a file with which you are finished.
Unicode and MBCS support
Yes
Yes
Compare and merge Unicode or MBCS encoded text files (ASCII files are also supported). Critical for working with many non-English language files. For the benefit of our Japanese customers, EUC-JP encoding is also supported.
Input method editor (IME) support
Yes
Yes
Facilitates convenient entry and editing of text in character-rich Asia-Pacific languages.
Overview strips
Yes
Yes
Provides an instant visual indication of the extent of the changes between files and where those changes occur. Clicking on a change in an overview strip will jump directly to that change.
Conflict highlighting
 
Yes
After an automatic merge, any conflicting sections of the files being merged are flagged for manual processing. Commands and shortcut keys are provided to jump between conflicts. Even difficult files can thus be processed swiftly using a combination of automatic and manual merging.
Edit markers
Yes
Yes
Visual history of any changes (edits or copies from another file) made to a file during the merging process.
Bookmarks
Yes
Yes
Makes it easy to mark and return to particular points of interest in a file.
Go to line
Yes
Yes
Jump directly to a line using its line number.
Read-only and modified indicators
Yes
Yes
Visual indication of whether a file is read-only and whether it has been modified since last saving.
Change summary
Yes
Yes
Indicates the number of changes between each pair of files.
Column/line number indicator
Yes
Yes
Identifies the current location of the cursor when editing a file.
Drag and drop files
Yes
Yes
Open files by dragging from the Windows Explorer.
Printing support
Yes
Yes
Produce a hard copy (or a PDF file using Acrobat Distiller) of comparisons for reference or audit. Printed comparisons contain all the highlighting and linking lines of the on-screen presentation. To save paper, you can choose to print just the pages that contain changes.
Print preview
Yes
Yes
See how a comparison printout will look before committing it to paper.
Source code control and software configuration management integration
Yes
Yes
Integrate Merge with popular source code control and software configuration management systems such as Perforce and Continuus/CM.
Automation API
Yes
Yes
Control Merge from other applications or integrate it with your workflow.
Virtual File System (VFS) API
Yes
Yes
Enables third parties to extend Merge to browse directly, for example, configuration management or version control repositories.
VFS FTP plugin
Yes
Yes
Enables Merge to access files and folders located on an FTP server.
VFS plugins forSubversion,Perforce, Visual SourceSafe,Mercurial, and Git
Yes
Yes
Gives Merge read-only access to files and folders located in Subversion repositories, Perforce depots, Visual SourceSafe databases, and Mercurial and Git repositories.
Command-line
Yes
Yes
Control Merge from other applications or integrate it with your workflow using the dedicated command-line utility.
Flexible whitespace handling
Yes
Yes
Prevents flagging of whitespace differences when whitespace is not considered important.
Flexible line ending support
Yes
Yes
Allow intelligent cross-platform file sharing: work with files containing UNIX (LF), Windows (CR LF) or Mac (CR) style line endings. Choose whether to ignore differences in line endings when comparing files.
Display line ending characters
Yes
Yes
Optionally see individual CR and LF characters to identify differences in multiple-platform originated files.
Regular expression support
Yes
Yes
Ignore differences in comments, source code control keywords and other defined text patterns when comparing files.
Block indent/un-indent
Yes
Yes
Easily set the correct indentation level of entire blocks of text when merging text from different files.
Find/Replace
Yes
Yes
Search for, and optionally replace, specified text within a file or selection.
Customize fonts and colours
Yes
Yes
Change the style of presentation to suit your preferences or needs.
Customize printed headers and footers
Yes
Yes
Set the headers and footers of printed pages to suit your requirements.
Keyboard shortcuts
Yes
Yes
Save time by controlling Merge using the keyboard.
Drag and drop text editing
Yes
Yes
Conveniently move arbitrary text between files or within a file using the mouse.
Jump to next/previous change
Yes
Yes
Quickly move between changes in a file using the mouse or keyboard shortcuts.
Replace file commands
Yes
Yes
Conveniently replace the contents of one file with that of another. Useful when one revision is entirely correct and its contents need to be copied to another revision.
Tab strip
Yes
Yes
Switch between multiple file comparison windows with a single mouse click.
Toolbars or ribbon
Yes
Yes
Easily access frequently used commands.
Folder comparison and synchronization
 
Standard/
Professional/
Benefit
Folder comparison and synchronization Instant Overview
Yes
Yes
Learn how to compare and synchronize folders with Merge in a few minutes.
Two-way folder comparison
Yes
Yes
Identify file insertions, removals and changes between two folder hierarchies. Efficiently process entire sets or branches of source code, web pages or other text files.
Three-way folder comparison
 
Yes
Identify file insertions, removals and changes between two folder hierarchies and a common ancestor (or some other) folder hierarchy. Use to reconcile conflicting changes made to a set of files by multiple developers or to merge branches in a source code control or software configuration management system.
VFS FTP plugin
Yes
Yes
Enables Merge to access files and folders located on an FTP server. For example, use Merge to synchronize a local copy of a website’s content with the main site itself, provided the main site is running an FTP server.
VFS plugins forSubversion,Perforce, Visual SourceSafe,Mercurial, andGit
Yes
Yes
Gives Merge read-only access to files and folders located in Subversion repositories, Perforce depots, Visual SourceSafe databases, and Mercurial and Git repositories. Use a Merge folder comparison to compare a Subversion or Perforce client workspace against the depot. Alternatively, directly compare different branches (or the same branch at different points in time) within a Perforce depot.
Reports in HTML and XML format
Yes
Yes
Create reports on folder comparisons for archiving, distribution or export to other applications. 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, in one operation, 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.
Bookmarks and comments
Yes
Yes
Mark points of interest. Annotate comparisons with comments and questions, before saving as a single-file archive to be emailed to other team members for review.
Single-file comparison archives
Yes
Yes
Save a comparison to a single file for archival or later review, even on a different machine. Saved folder comparisons include any bookmarks and associated comments that have been created, making it possible to annotate comparisons with questions and comments, before emailing them to other team members for review.
Comparison statistics window
Yes
Yes
See a summary of the current comparison.
Folder synchronization
Yes
Yes
Reconcile differences between folder hierarchies either by copying files from one folder hierarchy to another (or even to a completely separate location) or by launching file comparisons for changed files. Efficiently process entire sets or branches of source code, web pages or other text files. Keep folder hierarchies on different machines (for example, a desktop and a laptop) in sync with one another.
Integrated file comparison
Yes
Yes
Identify and reconcile differences withincorresponding files as well as between folder hierarchies by launching file comparison windows for selected files.
Printing support
Yes
Yes
Produce a hard copy (or a PDF file using Acrobat Distiller) of comparisons for reference or audit. Printed comparisons contain all the highlighting of the on-screen presentation. To save paper, you can choose to print just the pages that contain changes.
Print preview
Yes
Yes
See how a comparison printout will look before committing it to paper.
Visibility filters
Yes
Yes
Show only the files and folders of interest that match criteria you define.
Selection filters
Yes
Yes
Select files and folders of interest that match criteria you define. Enables complex sets of files to be selected for file merging or folder synchronization.
Thorough comparison option
Yes
Yes
Compare corresponding files in folder hierarchies using the criteria (whitespace significance, line ending handling, etc) defined for file comparisons.
Byte-by-byte comparison option
Yes
Yes
Speed up folder comparisons by comparing corresponding files in folder hierarchies that are larger than a certain size using a quick and memory efficient byte-by-byte comparison algorithm.
Quick comparison option
Yes
Yes
Save time by performing an extremely fast folder comparison using just the sizes and timestamps of corresponding files.
Customize fonts and colours
Yes
Yes
Change the style of presentation to suit your preferences or needs.
Customize printed headers and footers
Yes
Yes
Set the headers and footers of printed pages to suit your requirements.
Drag and drop folders
Yes
Yes
Select folders for comparison by dragging from the Windows Explorer.
Toolbars or ribbon
Yes
Yes
Easily access frequently used commands.
Other features
 
Standard/
Professional/
Benefit
Cross platform licence
Yes
Yes
A single licence enables you to use both theWindows and Mac OS X versions of Merge.
Comprehensive documentation
Yes
Yes
Quickly find relevant documentation. All documentation is available both as a single integrated set of online help (included with the product) and also on the Araxis website.
Full context sensitive help
Yes
Yes
Easily find specific help for every menu item, dialog and dialog control. Context sensitive help is tightly integrated with the main documentation, allowing you to read around a particular topic.
Install/uninstall support
Yes
Yes
Conveniently install and uninstall Merge from your machine.
 
Description     
               Quantity
          Price
 
 
Merge Standard Edition License
Covers both Windows and OS X
Includes 1 year of upgrades and support
               1
             €99
 
Merge Professional Edition License
Covers both Windows and OS X
Includes 1 year of upgrades and support
               1-4
             €199
                5-19
             €179
                20-99
             €159
                100+
            [Contact Us]
 
For quantities above 100 licenses please contact us at sales@unitedaddins.com, and we will be happy to provide you with a quote.
Thank You!