Araxis Merge

Enhancements:

• 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. This change improves clarity and reduces visual clutter.
• A optional confirmation dialog can now be shown before files are deleted from a folder comparison.
• The keyboard shortcut for the folder comparison Delete Selected command has been changed from Delete to Cmd+⌫. This change makes it less easy to invoke the command accidentally; it also better aligns Merge with macOS Finder.
• File and folder path entry fields without focus now elide a portion of long paths.
• File and folder path entry fields now dim (to indicate that they cannot be edited) when they display a title rather than a filename.
• Folder comparison columns can now be sized to their content by double-clicking a column divider in the header of the results list.
• Text comparison merging buttons are no longer shown for merging into a read-only file.
• SVG files now open as text, rather than as images that cannot be rendered by macOS.
• Instructions for integrating Merge with Android Studio and various JetBrains IDEs have been added. The existing instructions for integrating with JetBrains IntelliJ IDEA and PhpStorm have also been updated.
• The Command-Line Reference has been completely reworked.
• When invoked with the -h option, the command-line compare utility now opens the Command-Line Reference in a web browser.
• 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.
• The toolbar icons in the documentation have been updated.
• Various dialogs have been updated to use base localization; this simplifies localization going forward. Minor differences in the layout of these windows are expected, but otherwise there should be no user-visible effect.
• The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to the Adoptium Eclipse Temurin OpenJDK Temurin-17.0.5+8.
• The Merge major version number has been updated to 2023 to reflect the year of release. Copyright notices have been updated accordingly.

Defects fixed:

• Comparison history lists now always open with the top row visible.
• In the central pane of file comparisons, inserted and removed blocks of text (and their line numbers) now use the appropriate font styles.
• An AppleScript error no longer occurs when a double quotation mark occurs within a single-quoted title argument to the command-line compare utility.
• The read-only indicator for a comparison panel is now shown when that panel has been set as read-only via the AppleScript API.
• The Standard Edition of Merge now correctly displays only two comparison panes when launched from the command-line with more than two folders specified.
• It is no longer possible to reorder columns in preference tables.
• The decimal point character (.) is now used as the separator character for numeric comparison input fields in the preferences, regardless of locale.