
The toolbar icons in the documentation have been updated. New -readonlyN and -readonly options have been added to command-line compare utility to force some or all panes in a comparison to be read-only. When invoked with the -h option, the command-line compare utility now opens the Command-Line Reference in a web browser. The Command-Line Reference has been completely reworked. The existing instructions for integrating with JetBrains IntelliJ IDEA and PhpStorm have also been updated.
Instructions for integrating Merge with Android Studio and various JetBrains IDEs have been added. SVG files now open as text, rather than as images that cannot be rendered by macOS. Text comparison merging buttons are no longer shown for merging into a read-only file. Folder comparison columns can now be sized to their content by double-clicking a column divider in the header of the results list.
File and folder path entry fields now dim (to indicate that they cannot be edited) when they display a title rather than a filename. File and folder path entry fields without focus now elide a portion of long paths. This change makes it less easy to invoke the command accidentally it also better aligns Merge with macOS Finder. The keyboard shortcut for the folder comparison Delete Selected command has been changed from Delete to Cmd+⌫. A optional confirmation dialog can now be shown before files are deleted from a folder comparison. This change improves clarity and reduces visual clutter. In the central pane of file comparisons, inserted blocks now use the foreground and background colours for inserted text rather than potentially blended colours as before likewise, removed blocks always use the removed text colours. Subversion and Perforce) that allow a third-party comparison/merging tool to be specified.įor 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. Merge integrates with many version control (VC) and software configuration management (SCM) systems (e.g. 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 Time Machine, so you can compare older versions of files. 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).
Araxis Merge is the two- and three-way visual file comparison/merging and folder synchronization application.