Name: Araxis Merge Professional
Version: 2016.4774 (El Capitan)
Mac Platform: Intel
OS version: 10.11.0
Processor type(s) & speed: 64-bit processor
More Info: http://www.araxis.com/merge/
Advanced 2 and 3-way file comparison (diff), merging and folder synchronization
Araxis Merge is the two- and three-way visual file comparison/merging and folder synchronization application. Use it to compare, understand and combine different versions of source code, Web pages and other text files, or even text copied and pasted from another application (e.g., Pages or Microsoft Word). Merge integrates with Time Machine, so you can compare older versions of files.
Merge is a compelling choice for software developers, lawyers, product release managers, Web designers and other professionals who work with multiple revisions of text files, including ASCII, MBCS and Unicode files. Merge integrates with many version control (VC) and software configuration management (SCM) systems (e.g. Subversion and Perforce) that allow a third-party comparison/merging tool to be specified.
For legal professionals: instantly identify every change by copying text from different contract drafts being edited in another application (such as Microsoft Word) and pasting it directly into a file comparison window. Many more features.
Broad appeal - The choice of software, web design, legal and publishing professionals. Compare source files, web pages and contract drafts.
Text comparison and merging - Spot changes between source, HTML, XML or other text file revisions. Accept, merge, edit or delete them.
Compare text from common office files - Directly compare text from Microsoft Word and Excel, OpenDocument (ODF), PDF and RTF files.
Image and binary comparison - Pixel comparison for images. Byte-level comparison for binary files.
3-way comparison and automatic merging (Pro) - Swiftly reconcile even the largest sets of revision-managed files. Perfect for team development.
Folder comparison and sync - Conveniently compare and interactively merge entire folder trees.
Direct access to SCM (version control) systems - Direct repository access for select systems. Integration with dozens of others.
Portable reports - Generate HTML, XML and UNIX diff reports to share with your colleagues.
Printing and automation - Print a hard copy of comparisons. Write scripts to automate Merge.
What's New in Version 2016.4774:
Leaving the Search size field empty in a binary comparison no longer causes an error.
The pointer becomes an arrow when hovering over an inline merging button and no longer flickers.
It is now possible to replace found text with an empty string. Previously, this only worked erratically.
The Break lines at word boundaries preference works when Show whitespace characters is enabled.
The font and background colours of file comparisons may now be changed in the Japanese localization of Merge.
Pressing Option+Tab while editing a pane of a text comparison will always now insert a literal tab character.
The File>Save As>Save Comparison As… menu command works correctly when the Finder preference Show all filename extensions is unchecked.
The keyboard shortcut for the File>Set Character Encoding menu command is now shown.
Merge no longer uses the Apple-reserved keyboard shortcut Shift+Cmd+3.
The documented Option+Cmd+W keyboard shortcut (to close all open windows) now works.
The system-version-specific keyboard shortcut Option+Cmd+T has been removed from the documentation.
Binary comparisons no longer display with excessive spacing for certain combinations of formats and display options.
Items on binary and image comparison control strips are sized and positioned consistently.
Control positioning on text and folder comparisons is now the same for the Japanese localization as it is for the English.
In a folder comparison, the file path text field width adjusts appropriately when changing the visibility state of the Changes column.
Items on the Edit>Find menu are no longer inappropriately enabled for binary and image comparisons.
The user interface has been update to use the word ‘Recompare’ consistently, rather than a mixture of ‘Re-compare’ and ‘Recompare’.
The Edit>Find>Go to Line… menu item has been disabled for folder comparisons.
The Preferences>Text Comparisons>Editing>Tab key indents/unindents instead of cycling input focus preference has been renamed to Tab key inserts tab character instead of cycling focus. This better indicates its behaviour, and is more consistent with the corresponding option in Merge for Windows.
Various instances of the (non-dictionary) word ‘unindent’ in the user interface and documentation have been changed to ‘un-indent’.
The folder comparison context menu Re-Test Selected Rows item has been renamed to Retest Selected Rows for consistency with the rest of the user interface.
The UNIX diff Context Report Example documentation has been corrected.
Registration information is now sent securely and directly to Araxis, instead of first redirecting via an HTTP URL.