Araxis Merge

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. Versions for OS X 10.6, 10.7, 10.8 and 10.9 are available here.

• The Merge major version has been updated to 2014 to reflect the year of release.
• Dropping two or three folders on to a text comparison now opens a new folder comparison, rather than giving an error.
• Dropping one or more files on to a folder comparison results in an appropriate file comparison being opened, rather than giving an error.
• The user is expressly alerted if conflicts are detected in a three-way automatic file merge.
• The Open new comparisons in a tabbed window option on the General preference page has been renamed to Open new comparisons in a tab to more clearly reflect its purpose.
• HTML comparison reports now merely mention that a modern, standards-compliant browser is required to view them. Previously, specific browsers were named.
• On the Syntax Highlighting preference page, the syntactic elements for each language family are now sorted alphabetically.
• The Upgrading Merge or Installing Newer Builds page has been updated.
• The URL for the Generic Syntax Highlighting page has been updated for consistency with the Merge for Windows documentation.
• The registration window is now centred by default.
• References to the AraxisMergeCMP.plugin plugin specific to OS X 10.6 have been removed from the documentation.
• Working copies are again editable when files are opened from Subversion using the araxissvndiff utility.
• The left and right arrow keys no longer exhibit undersired behaviour in certain circumstances when the text cursor is positioned directly at the end of a line in a text comparison.
• The time taken to select rows of a specific type (e.g. changed, inserted, removed) in large folder comparisons has been significantly reduced under OS X 10.9.
• The Previous Change button no longer fails to function in binary file comparisons under certain circumstances.
• In the Japanese localization of Merge user interface, the colour buttons on the Fonts/Colours folder comparison preference page now work.
• Opening a saved comparison for a second time after previously opening and then refreshing it no longer gives an error.
• The duplicate Use filter programs in folder comparisons option has been removed from the File Types preference page. This option now appears on the Scan preference page.
• On the Display preference page, the Break changes into individual lines option is now disabled when the mutually exclusive Don’t show changes within lines option is checked.
• The positioning of the Use filter programs in folder comparisons option on the Scan preference page has been adjusted.
• The Click here to renew support/updates notification message link has been fixed.