| |
Standard Edition |
Professional Edition |
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 comparison and merging |
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. |
| 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. |
| 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 for Perforce and Visual SourceSafe |
Yes |
Yes |
Gives Merge read-only access to files and folders located in Perforce depots and Visual SourceSafe databases. |
| Command line |
Yes |
Yes |
Control Merge from other applications or integrate it with your workflow. |
| 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. |
| Customize toolbars |
Yes |
Yes |
Keep toolbars uncluttered with only the buttons that you need. |
| 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 |
Yes |
Yes |
Easily access frequently used commands. |
.jpg)
