Araxis Merge Changelog

What's new in Araxis Merge 2024.5981

Jan 19, 2024
  • Enhancements:
  • When text is selected in a text comparison, the number of occurrences of that text in the file is now shown in the status bar. #6791
  • When a folder comparison encounters an error when comparing files, those files are now considered to be modified rather than unchanged. This ensures that the relevant row in the folder comparison is not hidden when Keep unchanged rows hidden is enabled. #6807
  • When a file is reformatted, Merge previously showed a notification message at the bottom of that file’s pane. This message disturbed the centre position used for linking panes together. Merge no longer shows the message, but instead displays a blue circular indicator (similar to the modified and read-only indicators) to the right of the pane’s filename entry field. The indicator has a tooltip to indicate its purpose. #6802
  • The message that is displayed when reformatting a file fails now states that the file was not reformatted. #6802
  • Reformatting is now faster, especially for files where reformatting produces a large number of changes. #6805
  • When reformatting a file, if Clang-Format fails with an ‘incomplete format’ error message, the line number reported by Clang-Format is now displayed in the error message displayed by Merge. #6805
  • The Compile time regular expressions library has been added to the Legal Notices. #6855
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to the Adoptium Eclipse Temurin OpenJDK 21.0.1+12. #6832
  • The Merge major version number has been updated to 2024 to reflect the year of release. Copyright notices have been updated accordingly. #6838
  • Defects fixed:
  • Extracting text from larger Microsoft Excel .xlsx files no longer fails with an inappropriate ‘Zip bomb detected’ exception. #6832
  • An appropriate error message is now shown when attempting to open a password-protected Office Open XML document. #6832
  • Comparison pane content now displays more predictably at small pane sizes. In resolving this issue, the minimum size of the Merge application window has been increased to 640×480 pixels at 100% UI scaling. #6818
  • The File Comparison Keyboard Shortcuts topic has been corrected and improved. #6828
  • The Configuring a Windows Paging File topic has been updated for current Windows versions. #6846
  • Three missing dialog help topics are now present. #6848#6849
  • Various other minor corrections and improvements have been made to the documentation. #6852#6854

New in Araxis Merge 2023.5954 (Oct 25, 2023)

  • This release adds support for Windows 11 23H2, optional automatic reformatting for certain file types, the binary comparison of very large files, and a variety of other enhancements and fixes. Please read the release notes for a complete list of changes.
  • This is the current production-quality release and is recommended for all users.
  • This release is free-of-charge to all customers with upgrade/support entitlement covering the build date indicated in the download box below, including everyone who purchased Merge within the year prior to that date.
  • Warning Araxis is considering the removal of the following little-used features in a future release of Merge: text comparisons for patching, the FTP file system plugin, and the Perforce file system plugin (but not general integration with Perforce unrelated to the file-system plugin, which will be retained). Please contact Araxis if the removal of any of these features would inconvenience you.
  • Enhancements:
  • Merge is now tested and supported on Windows 11 23H2 (2023 Update). This support replaces that for Windows 11 21H2 and Windows 10 21H2. (Merge may continue to work on the latter two platforms, but they are no longer officially tested or supported.) #6799
  • A new option, Reformat the following types of text file before they are compared, enables certain types of files (JSON files and others supported by Clang-Format, including C, C++, C#, Java, JavaScript, JSON, Objective-C, and Protobuf files) to be reformatted automatically when loaded into Merge. For more information, please see Automatic formatting. #6760
  • On systems with sufficient memory, binary comparisons now support comparisons of files larger than 2–4 GB. #6727
  • Binary comparisons are more efficient in their use of memory than before. #6727
  • Binary and image comparisons now detect when loaded files are modified outside of Merge. The Automatically reload externally modified files setting on the File Comparisons options page also now works for image and binary comparisons. #5680
  • The split-view folder-comparison-with-file-comparison (Two-way with file comparison ) is now able to compare renamed files in the same way as file comparisons launched using the Launch comparisons button. Please see the Launching multiple file comparisons section of the Launching File Comparisons topic. #6777
  • The Launching multiple file comparisons and Launching a file comparison for arbitrary files sections of the Launching File Comparisons topic have been rewritten and expanded. #6777
  • More options are now provided for configuring the text antialiasing used by file comparisons. Please see the documentation for the Text antialiasing setting on the Fonts and Colours options page. #6781
  • Defects fixed:
  • Line endings have been corrected in the Japanese-language example text files supplied with Merge. #6810
  • A problem with rendering text when text antialiasing is disabled has been corrected. #6781
  • The optional folder comparison Versions column now correctly displays the product version embedded in certain executable files in addition to the file version. #6803
  • The scroll bar buttons in image comparisons now scroll images in the correct directions. #6815

New in Araxis Merge 2023.5916 (Jul 17, 2023)

  • This release includes various quality-of-life enhancements and fixes. Please read the release notes for a complete list of changes.

New in Araxis Merge 2023.5877 (May 4, 2023)

  • Enhancements:
  • The Alt+1 (one) to Alt+0 (zero) shortcut keys can now be used to activate the quick-access command that is at the position in the caption bar corresponding to the pressed number key: Alt+1 activates the left-most quick-access command; Alt+2 activates the second from left, etc.; Alt+0 activates the tenth quick-access command, if there is one.
  • Additional whitespace-related options are now available as quick-access commands: Ignore all, Ignore leading, Ignore trailing, and Ignore consecutive.
  • Quick-access commands that represent on/off options are now represented in the caption bar as two-letter icons. This makes it easier to identify particular options.
  • It is now possible to choose between tabs or spaces when indenting or un-indenting blocks of text with Ctrl+I or Ctrl+U in a file editing panel.
  • Individual entries in file/folder comparison history lists may now be removed by pressing the Delete key.
  • Merge is now able to extract text from a wider range of PDF files.
  • When extracting text from HTML files, character encoding is now detected if declared via meta elements.
  • Various text-extraction filters have been enhanced in various ways to produce improved results.
  • Text-extracted from PDF and .doc files now has LF line-endings. This provides consistency across macOS and Windows.
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to the Adoptium Eclipse Temurin OpenJDK Temurin-17.0.6+10.
  • Defects fixed:
  • Printed folder comparisons (and their print previews) once again reflect the collapsed/expanded states of the folders in the folder comparison results list.
  • Folder comparison status-line statistics are now updated when columns are swapped.
  • The patch file pane and its toolbar are now properly aligned in text comparisons for patching.
  • The Application menu ▸Save as… menu item icon is now correct and its label properly capitalized.

New in Araxis Merge 2023.5849 (Feb 6, 2023)

  • Enhancements:
  • A new facility makes it possible to prevent folder comparisons from overloading a file storage device or service (e.g. a cloud-based datastore such as Microsoft OneDrive). For more information, see the FAQ item. #6529
  • The command-line Compare.exe utility has been enhanced to enable improved integration of Araxis Merge with Android Studio and various JetBrains IDEs. The corresponding instructions for integrating Merge with those IDEs have been updated accordingly. #6618
  • The Command-Line Reference has been completely reworked. #6657
  • When invoked with the /? or /h option, the command-line Compare.exe and ConsoleCompare.exe utilities now open the Command-Line Reference in a web browser. #6631
  • Folder comparison results lists now update much more efficiently for large folder comparisons, thereby improving user-interface responsiveness. #6631
  • The various comparison layout ribbon commands (Two-way (horizontal) , Two-way (vertical) , Two-way with file comparison , Three-way (horizontal) , Three-way (vertical) , and Three-way with file comparison ) may now be added to the window caption as quick-access items. #6634
  • The text comparison line-detail panel now has a context menu for text manipulation commands. The ribbon Cut , Copy , Paste , and Select all commands now operate on the line-detail panel when it has context. #6562
  • Two new items have been added to the External ribbon menu: Run program on current file… and Run program directly on current file…. This makes the pre-existing keyboard shortcuts for these commands (Shift+F9 and F9, respectively) discoverable via the user interface. #6555
  • The documentation screenshots and instant overviews have been updated. #2641
  • 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. #6628
  • The libarchive library used by Merge has been updated to version 3.6.1. #6645
  • The libpng library used by Merge has been updated version 1.6.38. #6646
  • The liblzma library used by Merge has been updated to that provided by XZ Utils version 5.2.8. #6647
  • The zlib library used by Merge has been updated version 1.2.13. #6648
  • The Merge major version number has been updated to 2023 to reflect the year of release. Copyright notices have been updated accordingly. #6659
  • Defects fixed:
  • Rows in a folder comparison now update correctly following a Swap panes operation. #6702
  • The Ctrl+F1 shortcut now correctly hides and shows the ribbon in folder comparisons. #6291
  • HTML reports once again correctly highlight changes for comparisons where a file is not present in one of the panes. #6598
  • The line-detail pane now correctly shows at most one concealed-change indicator for a given line. #6649
  • Line wrapping is now always disabled in the line-detail pane. #6649
  • Cancelling a long-running binary comparison can no longer result in a crash. #6661
  • A crash caused by the Find ▸Replace… ▸Replace all command in certain circumstances no longer occurs. #6651
  • It is now possible to replace text within a single-line selection. Previously, replacing text within a selection was possible only when the selection spanned two or more lines. #6651
  • Finding or replacing a string within the current selection will now only find or replace text that is entirely within the selection. #6651

New in Araxis Merge 2023.5848 (Jan 30, 2023)

  • Enhancements:
  • A new facility makes it possible to prevent folder comparisons from overloading a file storage device or service (e.g. a cloud-based datastore such as Microsoft OneDrive). For more information, see the FAQ item. #6529
  • The command-line Compare.exe utility has been enhanced to enable improved integration of Araxis Merge with Android Studio and various JetBrains IDEs. The corresponding instructions for integrating Merge with those IDEs have been updated accordingly. #6618
  • The Command-Line Reference has been completely reworked. #6657
  • When invoked with the /? or /h option, the command-line Compare.exe and ConsoleCompare.exe utilities now open the Command-Line Reference in a web browser. #6631
  • Folder comparison results lists now update much more efficiently for large folder comparisons, thereby improving user-interface responsiveness. #6631
  • The various comparison layout ribbon commands (Two-way (horizontal) , Two-way (vertical) , Two-way with file comparison , Three-way (horizontal) , Three-way (vertical) , and Three-way with file comparison ) may now be added to the window caption as quick-access items. #6634
  • The text comparison line-detail panel now has a context menu for text manipulation commands. The ribbon Cut , Copy , Paste , and Select all commands now operate on the line-detail panel when it has context. #6562
  • Two new items have been added to the External ribbon menu: Run program on current file… and Run program directly on current file…. This makes the pre-existing keyboard shortcuts for these commands (Shift+F9 and F9, respectively) discoverable via the user interface. #6555
  • The documentation screenshots and instant overviews have been updated. #2641
  • 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. #6628
  • The libarchive library used by Merge has been updated to version 3.6.1. #6645
  • The libpng library used by Merge has been updated version 1.6.38. #6646
  • The liblzma library used by Merge has been updated to that provided by XZ Utils version 5.2.8. #6647
  • The zlib library used by Merge has been updated version 1.2.13. #6648
  • The Merge major version number has been updated to 2023 to reflect the year of release. Copyright notices have been updated accordingly. #6659
  • Defects fixed:
  • Rows in a folder comparison now update correctly following a Swap panes operation. #6702
  • The Ctrl+F1 shortcut now correctly hides and shows the ribbon in folder comparisons. #6291
  • HTML reports once again correctly highlight changes for comparisons where a file is not present in one of the panes. #6598
  • The line-detail pane now correctly shows at most one concealed-change indicator for a given line. #6649
  • Line wrapping is now always disabled in the line-detail pane. #6649
  • Cancelling a long-running binary comparison can no longer result in a crash. #6661
  • A crash caused by the Find ▸Replace… ▸Replace all command in certain circumstances no longer occurs. #6651
  • It is now possible to replace text within a single-line selection. Previously, replacing text within a selection was possible only when the selection spanned two or more lines. #6651
  • Finding or replacing a string within the current selection will now only find or replace text that is entirely within the selection. #6651

New in Araxis Merge 2022.5822 (Nov 29, 2022)

  • This release improves character-encoding detection for HTML files and also fixes several defects.

New in Araxis Merge 2022.5812 (Nov 1, 2022)

  • This release adds a files-only display option to folder comparisons and integrates with the new Windows 11 File Explorer context menu. It also provides several other enhancements.

New in Araxis Merge 2022.5757 (Aug 4, 2022)

  • Defects fixed:
  • Merge no longer crashes when attempting to upgrade any file or folder comparison Show history list entries stored in the Windows Registry by Merge 2018.5059 or earlier. This problem was introduced by Merge 2022.5752. #6568

New in Araxis Merge 2022.5754 (Jul 26, 2022)

  • This release fixes a problem with user-interface performance that was introduced by the previous release.

New in Araxis Merge 2022.5752 (Jul 18, 2022)

  • Enhancements:
  • Merge is now able to reformat JSON files and also file types supported by Clang-Format (including C, C++, C#, Java, JavaScript, JSON, Objective-C, and Protobuf files). For more information, please see Formatting. #1162#6493
  • Several variables may now be specified as arguments when launching an external program on a file in a file comparison. In particular, it is now possible for Merge to provide the current cursor position to an external program. For full details, please see Run Program. #6546
  • New F9 and Shift+F9 keyboard shortcuts launch an external program on the file in the currently active comparison pane. For further information, please see Run Program. #6546
  • The background colour of comparison scrollbars has changed to match the comparison panel background. In addition, linking lines now extend across the middle-pane vertical scrollbar in text comparisons. These changes improve clarity and reduce visual clutter, as well as better aligning the visual appearance of Merge for Windows with that of Merge for macOS. #6515#6545#6557
  • Four text comparison toggle options can now be configured as Quick-access commands: Ignore case, Ignore line endings, Show line endings, and Show unchanged lines only for context. #6469
  • Binary comparisons can now take advantage of multiple processor cores, improving performance for large files by up to two times. #6467
  • Holding Alt while completing the selection of a file or folder for a path entry field now suppresses the start of the comparison. This makes it possible, for example, to choose one folder to be compared and then another, without the comparison starting automatically in between. Holding Alt works for all methods of selecting files or folders, including double-clicking a file/folder in an open-file or open-folder dialog, choosing folders or files from Versions and Show history lists, and dragging-and-dropping files on to a comparison. Thus, in general, holding Alt populates the comparison path fields from the relevant source but does not launch the comparison. Note, however, that pressing Return in a file or folder path entry field still causes the comparison to be performed. #6492
  • In the central pane of file comparisons, inserted blocks always 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. #6473
  • Change highlighting in three-way binary comparisons is now relative to the common ancestor (middle) pane, as it is with text comparisons. #6484
  • In binary comparisons, the value of the Columns field is now remembered when a comparison is closed, and subsequently used when a new binary comparison is opened. Previously, new binary comparisons always opened with Columns set to Auto. #6491
  • The gap above the status text at the bottom of the application window has been reduced. This slightly increases the amount of vertical space available to comparison content. #6516
  • On Windows 11, the border of file and folder comparison path entry fields is now visually consistent with the border of the file/folder comparisons panels. #6508
  • On Windows 11, the window caption bar background colour now matches the background of the ribbon, giving a cleaner, less-cluttered appearance. #6513
  • In folder comparisons, the Changes column now shows =1 instead of 1 when there are changes between files compared using the File timestamps and sizes only method. For more information, please see Method. #6460
  • The CxImage, LibTIFF, LibJPEG, and JasPer libraries have been removed from Merge. This eliminates a considerable amount of third-party code from Merge and thereby reduces the potential for security issues. As a result, the following legacy image file types are no longer supported: .j2c, .j2k, .jp2, .jpc, .jpx, .pbm, .pgm, .ppm, .ras, .tga, .emf, .wmf, .dib, .pcx. #6499
  • The Libarchive library used by Merge has been updated to version 3.6.0. #6495
  • The Libbzip2 library used by Merge has been updated to version 1.0.8. #6497
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to the Adoptium Eclipse Temurin OpenJDK 17.0.3+7. #6536
  • The Extended Validation digital certificate used to sign Araxis Merge has been updated. #6438
  • Defects fixed:
  • Merge no longer crashes when launching comparisons from a folder comparison in very specific circumstances. #6543
  • It is now possible to open versions of a file located within a Git worktree using the Versions list. #6549
  • The comparison of certain large text files is no longer unexpectedly slow. #6538
  • When repositioning a comparison tab by dragging it to the right-most position in the tab strip, the insertion point showing where the tab would move is now shown. #6532
  • The history button in file/folder entry fields is now disabled when there is no history. #6521
  • The Git File System Plugin and Mercurial File System Plugin documentation topics have been corrected to remove the suggestion that the Versions button could be populated with folders in a repository. #6479
  • The sizing and alignment of file and folder comparison path entry fields is now consistent. #6508
  • It is no longer possible to position the text cursor over a merging button. #6510
  • The background of line numbers in the optional line-detail panel is now drawn properly and in the correct colour. #6553
  • On Windows 10, the file/folder comparison path entry-field border colour now exactly matches that of the comparison panels. #6508
  • A border is now drawn on the top edge of the tab strip when the ribbon is minimized. #6514
  • The status text for image comparisons no longer mentions irrelevant notable options. #6531
  • In the central pane of file comparisons, inserted and removed blocks of text (and their line numbers) now use the appropriate font styles. #6473

New in Araxis Merge 2022.5696 (Feb 14, 2022)

  • Enhancements:
  • Syntax highlighting is now supported for Markdown files.
  • Image comparisons now support 32-bit .bmp files in addition to those with lower bit depths.
  • Image comparisons also now support .dds, .dng, .wdp, and .cr2 files. In addition, .cr3 files are supported if the Microsoft Raw Image Extension is installed from the Microsoft Store and the appropriate pattern is added to an Image file type.
  • A new Notifications options page makes it easy to configure whether various notifications are shown.
  • Most notifications now have a close button that enables them to be dismissed.
  • A new NotificationDuration Windows Registry setting under the key HKEY_CURRENT_USERSoftwareAraxisMerge7.1 enables the time for which notifications are displayed to be specified.
  • A new option on the Display options page, Highlight text matching the current word/selection with background colour, enables the matching-text highlight colour to be configured.
  • In folder comparisons, it is now possible to copy files out of an archive (.zip, .tar, etc.).
  • The documentation for the folder comparison Changes column has been improved.
  • Obsolete Visual Basic 6 Automation sample code is no longer provided with Merge. References to Visual Basic 6 have been removed from the documentation.
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to the Adoptium Eclipse Temurin OpenJDK 17.0.1+12.
  • The Merge major version number has been updated to 2022 to reflect the year of release.
  • Defects fixed:
  • The text-extraction filter used by Merge previously included – but did not use – code from the Log4j library v. 1.2.14. Although this version of Log4j is unaffected by widely publicized security flaws that are present in some later versions of Log4j, and although this code was not in any case used by Merge, Log4j has now been removed entirely from Merge.
  • Image comparisons are no longer subject to the Warn when comparing files larger than threshold set on the Launch options page.
  • The trailing … has been removed from the folder comparison Delete selected ribbon item.
  • The spin controls have been removed from the byte offset fields in the binary comparison dialogs used to add or edit synchronization links.
  • In text comparisons, the left-margin cross-hatching indicating lines excluded from the comparison now always renders correctly.
  • Disabling the Extend linking lines across documents option on the File Comparisons options page no longer prevents the display of cross-hatching for lines excluded from the comparison.
  • Merge is now able to start even if the Windows UAC shield icon is unavailable for some reason.

New in Araxis Merge 2021.5618 (Oct 11, 2021)

  • Enhancements:
  • Merge is now fully tested and supported on Windows 11. #6329
  • The options pages and other dialogs throughout the application have been updated to use modern Windows fonts (Segoe UI for English and Yu Gothic UI Regular for Japanese) and dialog font sizes (10 points). #6332
  • The various options pages have been reworked to improve consistency and greatly reduce alignment and clipping problems caused by Windows UI scaling. (Pixel-perfect alignment is still not always possible across all UI scale factors due to the mechanism Windows uses to position controls in Win32 dialogs.) #6332
  • The ribbon in the Japanese localization has been updated to use the Yu Gothic UI Regular font. #6377
  • The image comparison blend and zoom controls now stay in better vertical alignment at higher UI scale factors. #6386
  • The text comparison Replace with first and third and Replace with third and first items removed in Merge 2021.5548 from the merging button context menu have been reinstated. Note that these items are not shown when multiple merging buttons are selected. #6326
  • Tooltips have been added to the tab strip’s drop-down Comparisons list . This makes it possible to see long tab titles that are otherwise truncated in the list. #6278
  • Progress is now indicated for individual large files being copied in a folder comparison. #6382
  • Following an automatic merge (whether invoked using the ribbon Merge to common ancestor button or via the command-line compare utility /merge option), Merge now shows the first conflict (if any). Any first conflict is similarly shown following a Mark conflicts operation. #6303
  • The Libarchive library used by Merge has been updated to version 3.5.1. #6337
  • The Use 7-Zip (if installed) for .udf, .rar and .7z archives option has been changed to Use 7-Zip (if installed) for .rar archives. #6337
  • All application keyboard shortcuts are now documented. See File Comparison Keyboard Shortcuts and Folder Comparison Keyboard Shortcuts. #5874#5930
  • A new FAQ item explains how to use the free AutoHotkey utility to redefine keyboard shortcuts. #5922
  • Help articles have been written for the Edit synchronization link dialogs of text and binary comparisons. #6376
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to version 16.0.2. #6373
  • Defects fixed:
  • The borders of the various comparison panels now render correctly on Windows 11. #6345
  • Folder comparisons now preserve the file creation date when copying a file from source to destination and overwriting a destination file of the same name. #5958
  • Merge no longer suddenly exits when attempting to open certain .rar archives. #6337
  • Text files containing embedded NUL characters that are identical at a binary level are now consistently reported as being identical. #6356
  • Text may now be extracted from .xlsx spreadsheets containing a great many more rows than before without running out of heap space. #6383
  • Extracting text from certain .xlsx spreadsheets no longer results in a crash. #6385
  • Development-related assertions are no longer enabled for Merge releases. #6370

New in Araxis Merge 2021.5585 (Aug 11, 2021)

  • Following the change to use DirectWrite for rendering text in the previous release, file and folder comparisons no longer respected configured font styles other than Regular. In addition, certain fonts (e.g. those with names beginning with @) did not work at all. These problems have been fixed. Note also that, as a result of the change to use DirectWrite for text rendering, the use of bitmapped (non-scalable) fonts is no longer supported. #6346

New in Araxis Merge 2021.5581 (Jul 19, 2021)

  • This release adds a basic zoom capability for image comparisons, enhances text rendering, better supports certain Unicode characters, and improves the extraction of text from ODF and OOXML word-processing documents. Various other enhancements and fixes are also included.

New in Araxis Merge 2021.5548 (Apr 15, 2021)

  • Enhancements:
  • The recently introduced text comparison line-detail panel is no longer experimental. Use the ribbon Options ▸Show line-detail panel menu item (or press Ctrl+Shift+L) to show or hide the panel. For more information about this feature, please see the relevant section in the Comparing Text Files (or Typed/Pasted Text) topic. #6255
  • Multiple merging buttons can now be selected. Clicking any selected merging button applies its action to all the blocks of changed lines that have selected buttons. To select several merging buttons, hold Alt and then click-and-drag to draw a selection box around the buttons. Additional merging buttons can be added to the selection by holding Alt and click-dragging further boxes. Press Ctrl+Shift+A to select all the merging buttons. #6224
  • The Hide/reveal menu has a new Reveal manually hidden rows command. #5903
  • File and folder name drop-down history lists now show a Double-click to open a row. Hold Ctrl and double-click to open a single item. hint. This makes the ability to open a single file or folder from the list easier to discover. #5904
  • In folder comparisons, it is now possible to select multiple, non-contiguous ranges using the standard Windows Shift and Ctrl modifiers. For example, the following sequence of actions is now possible: #1263
  • Select a row in a folder comparison.
  • Shift-click another row. The indicated range of rows is selected.
  • Ctrl-click a row outside the first selected range.
  • Shift-click another row. A second range of rows is selected.
  • The Windows Choose how many lines to scroll each time mouse wheel setting is now honoured. #6247
  • Having compared an archive (.zip, etc.) in a folder comparison, it is now possible to launch further folder comparisons from resulting folder rows. #6227
  • Files with the .xmind extension are now treated as zip archives and may therefore be compared using folder comparisons. #6251
  • By default, various audio and video file types (*.aif, *.asd, *.ogg, *.wma, *.mpg, *.mpeg) are now recognized as binary files and will be opened using a binary comparison. #6260
  • The Replace with first and third and Replace with third and first commands have been removed from the merging button context menu due to a lack of utility. #6290
  • The number of processors used for multi-threaded operations has been optimized. #6259
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to version 16. #6271
  • Scroll bars and the status bar are now drawn using DirectDraw instead of GDI. This should have no user-visible effect. #6235#6236
  • Legacy code relating to Windows 8.1 has been removed. In addition, Merge now refuses to run on Windows 8.1. (Support for Windows 8.1 was dropped by the earlier Merge 2021.5498 release.) #6210
  • Defects fixed:
  • Dropping an archive (.zip, etc.) file on to a pane in a binary comparison now opens that archive in the binary comparison, rather than launching a folder comparison of the contents of the archive. #6242
  • The Don’t show again checkbox in certain notification messages now takes effect even if Merge is closed shortly after the box is checked. #5868
  • The command-line Compare.exe utility now works even when a file named Program is present in the root directory. #6248
  • The progress indicator in the status bar for a running folder comparison is now removed when the comparison is closed and no other comparisons are open. #6280
  • A possible problem relating to tooltips in debug builds of Merge has been fixed. #6268
  • The Options ▸Show line-detail panel menu item has been removed from the ribbon in text comparisons for patching. #6262
  • Certain diagnostics are no longer enabled in release builds of Merge. #6277

New in Araxis Merge 2021.5534 (Feb 23, 2021)

  • Defects fixed:
  • Merge no longer sometimes crashes when an in-progress folder comparison is manually stopped

New in Araxis Merge 2021.5498 (Jan 20, 2021)

  • This release features substantive enhancements and several fixes.
  • This is the current production-quality release and is recommended for all users.
  • This release is free-of-charge to all customers with upgrade/support entitlement covering the build date indicated in the download box below, including everyone who purchased Merge within the year prior to that date.
  • Changes:
  • Information With Microsoft having ended mainstream support for Windows 8.1 in September 2018, and with very few Araxis customers still using Windows 8.1, support for running Merge on Windows 8.1 is removed as of this release. Customers may, of course, continue to use an older version of Merge (2020.5480 or earlier) that works with that platform. #6210
  • The Araxis snapshot service has been removed. #6143
  • Enhancements:
  • The tab strip has been considerably enhanced: #6150
  • Buttons have been added to the tab strip to scroll tabs left and right when there are too many to fit on the screen at once.
  • A Modified indicator is now shown in tabs for text comparisons that have modified files. The style of the file comparison Read-only and Modified indicators has been updated to match the new in-tab indicator.
  • The tab strip’s drop-down Comparisons list has a new icon. The list is now scrollable and can show all the open comparisons. Previously, the number of comparisons listed was limited to 20 items, necessitating a (now removed) More comparisons … menu item that displayed a modal dialog showing all the open comparisons.
  • Merge is now able to compare text files compressed with the gzip or bzip2 utilities. By default, files with the relevant extensions (.gz or .bz2) are automatically decompressed when loaded into a comparison. The extensions recognized may be changed on the File Types options page. Merge is also now able to save compressed text files. See Saving compressed files for more details. #5973
  • The application and document icons have been refreshed; they are also now a little larger. #6191
  • The folder comparison Merge to common ancestor button now only enables if at least one file row is selected. #5714
  • The Ctrl+= and Ctrl+- keyboard shortcuts can be used to increase and decrease the size of text in text and binary comparisons. #6097
  • In text comparisons, an experimental full-width line-detail panel (similar to that available on Merge for macOS) can now be enabled by setting the Windows Registry ShowLineDetailPanel value to 1 under the key HKEY_CURRENT_USERSoftwareAraxisMerge7.1. #6129
  • The tab icons at 300% user-interface scaling are a little bolder and now match the icons in the ribbon. #6153
  • The spacing of items in the caption bar has been improved. #6154
  • By default, Merge uses the Windows PATH environment to locate Git, Mercurial and Subversion executables. Merge now has registry keys that can be set to specify absolute paths to these utilities. For more information, please see the Git File System Plugin, Mercurial File System Plugin, and Subversion File System Plugin topics. #5848
  • In a folder comparison, it is possible for filenames that look the same to contain different Unicode code points. A new option, Show Unicode code points alongside file and folder names, on the Display options page can help determine why names differ when they appear to be composed of identical characters. #5856
  • In a folder comparison, clicking the Browse button in a folder-path entry-field that contains a non-existent path now shows a suitable error message before reverting to a default location. #5915
  • Various dialogs are now resizeable. #5932
  • Syntax highlighting is now faster. #6028
  • Very large file comparisons close much more quickly. #6028
  • The Libarchive library used by Merge has been updated to version 3.4.3. #5968
  • The Merge major version has been updated to 2021 to reflect the year of release. #6199
  • Defects fixed:
  • Folder comparisons now draw correctly when the font size is increased or decreased from the default. The vertical alignment of icons with file and folder names is also improved with non-default font sizes. #6201
  • When merging text using an append action, the newly appended text is now selected. This matches the behaviour of merging text with replace or prepend actions. #6061
  • Launching Merge Standard using the Explorer shell extension to compare more than two folders no longer causes the folder comparison’s split-view file comparison to close if it was open. #5987
  • An inconsequential logic error relating to the folder comparison Browse buttons has been corrected. #6147

New in Araxis Merge 2020.5480 (Nov 30, 2020)

  • Enhancements:
  • A new Folder comparisons▸Use multiple processor threads to compare folders option makes it possible to disable the use of multiple processor threads when performing folder comparisons. Folder comparisons may complete more quickly when this option is checked. However, on machines with many processor cores and slower storage devices (e.g. spinning hard disk drives), it may help to disable this option to prevent overloading the storage medium containing the folders being compared. #5897
  • New settings on the Application▸Display options page enable the horizontal, vertical, and drag scrolling directions to be independently reversed. #5980
  • A new Folder comparisons▸Launch▸Warn when launching comparisons larger than # KB in size option makes it possible to configure the threshold at which Merge will warn about opening a large comparison. This option prevents large (and therefore potentially slow) file comparisons from being inadvertently performed. For more information, see the Launch topic. #6033
  • The Text comparisons▸Display▸Show only # lines of context around changes option now treats lines forcibly ignored by block and line expressions as unchanged lines. #5999
  • MathLab Simulink .slx files are now recognized as zip archives. #5962
  • The instructions for integrating Merge with IntelliJ IDEA have been updated to take into account a change in the way IntelliJ IDEA works. #6123
  • If titles are provided for only some of the files or folders in a comparison launched using the command-line utilities, files/folders without titles now have editable pathname entry fields. Previously, all the entry fields were read-only if a title was provided for any of the files/folders in a comparison. #6084
  • Command-line tool usage dialogs are now high-DPI on high-DPI displays. #6017
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to 14.0.2. #6092
  • Defects fixed:
  • Scrolling image comparisons horizontally no longer leaves an unrendered strip at the left-hand edge of the image panel. #6038
  • Merging a change in reformatted XML should no longer sometimes insert unnecessary line endings. #5918
  • Replacing the last line of a file no longer adds a line ending if the line replacing it does not have a line ending. #5972
  • The araxisp4diff.exe utility can no longer crash if it is passed a parameter to set a title for a non-existent file or folder panel. #6161
  • When constructing arguments for hg.exe, the Mercurial plugin now appends the closing quote using a wide string instead of a narrow one. This has no practical effect, but the previous behaviour was incorrect. #5823

New in Araxis Merge 2020.5406 (Jul 13, 2020)

  • Enhancements:
  • The folder comparison ribbon Launch comparisons button can now be used to open new folder comparisons. Previously, it only worked to open file comparisons. #5952
  • History lists in the Japanese localization of Merge now use the yen sign as the path separator. #6023
  • A new Assume FTP servers use UTF-8 character encoding option has been introduced. When enabled, Merge is able to interpret and display filenames containing Unicode characters from certain Unicode-capable FTP servers (e.g. FileZilla). #5916
  • When comparing text files with certain block expressions enabled, any insertion or removal block that is adjacent to a change block will be combined with that change block, except when Intelligently split blocks of changed text based on matched line pairs is enabled. This helps to minimize visual clutter. #6046
  • Any surrounding double-quotation marks are now stripped when pasting a path into a comparison filename or folder-path entry field. This makes it easier to paste paths copied using the Windows Explorer Copy as path context-menu command. #5938
  • The folder comparison ribbon Options▸Recurse into sub-folders menu item has been renamed to Compare full folder hierarchy so that it matches its label in the options dialog. #6066
  • A performance optimization has very slightly reduced the time needed to render merging buttons in certain text comparisons that have many changes. #6055
  • A minor visual improvement has been made to the icon for the ribbon External item. #6039
  • Defects fixed:
  • Folder titles provided for folder comparisons (for example, when invoking a folder comparison from the command-line or via the Automation API) once again work properly. #6083
  • Semantic links are no longer generated for anonymous functions when comparing files of the same name from different folders. #6082
  • Ribbon text labels are now crisp on low-DPI displays. #6040
  • The Ignore differences in whitespace at the end of lines option now works properly for text comparisons with numeric data. #5917
  • Syntax highlighting of Pascal files now works with the dark theme. #6025
  • Text comparison linking-lines are now always drawn correctly when scrolling a comparison with vertical padding and certain block expressions enabled. #6050
  • Merging buttons and extended linking lines are now always drawn when certain line expressions are enabled. #6052
  • The pre-built COM interop assemblies interop.Merge70.dll file is no longer missing from the AutomationSamples subdirectory of the Merge installation. #6075

New in Araxis Merge 2020.5368 (May 11, 2020)

  • Enhancements:
  • Any differences in the case or Unicode normalization of filenames within a folder comparison row are now highlighted #5690
  • Folder comparison Open folder dialogs now have an Open URL… button and work in the same manner as file comparison Open file dialogs. #5858
  • Folder comparisons now start immediately when an Open folder dialog is dismissed with the Select Folder button. #5858
  • Dimmed text in a folder comparison has more contrast when using the light colour theme. #5946
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to 14.0.1. #5989
  • Defects fixed:
  • Under WSL2, hg merge no longer sometimes hangs after Merge returns control to Mercurial. This problem was not specific to Araxis Merge, but seems to have been caused by an interaction between Mercurial under WSL2 and Windows console programs generally. The problem has been resolved by always invoking Merge from WSL using the non-console Compare.exe command-line utility, rather than the console-based ConsoleCompare.exe as before. #6012
  • Syntax highlighting now works correctly in files containing Cyrillic characters. #5767#5885#5996
  • In text comparison panels, the horizontal position of the text caret is now maintained appropriately when moving up and down with the cursor keys after having edited the text. #5956
  • Saved comparisons now include any configured block expressions, as do options saved in the legacy (.mop7 or .MergeOptions7) format. #6000
  • In a folder comparison showing a file comparison view underneath, it is no longer possible for a crash to occur if a dialog is opened from the file comparison immediately following the selection of a new row in the folder comparison. #5979

New in Araxis Merge 2020.5354 (Apr 20, 2020)

  • Enhancements:
  • Merge for Windows now supports block expressions to define blocks of lines that you wish Merge to ignore. These blocks are bounded by lines matching a starting and ending regular expression. This capability can be useful for filtering out unimportant changes or blocks of auto-generated content. For more information, please see Block Expressions. #5803
  • As a result of the introduction of block expressions, the previously existing expressions have been renamed to line expressions. For more information, please see Line Expressions. #5803
  • There is a new Options…▸Text Comparisons▸Display▸Highlight text matching the current word or selection setting. When enabled, other occurrences of the currently selected word or selection in a text comparison are highlighted. #5833
  • One-click access to frequently used ribbon sub-menu commands is now provided via quick-access commands. For more information, see Making the Most of the Ribbon (Merge 2020 and later). #5944
  • The ribbon may now be hidden, thus maximizing the space on screen available for comparisons. Click Hide ribbon in the window caption bar or press Ctrl+F1 to hide the ribbon. Once hidden, click Show ribbon or press Ctrl+F1 to show the ribbon. #5950
  • Numbers with exponents prefixed by a plus sign (e.g. 1e+1) are now supported in comparisons with numeric data. #5913
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to 13.0.2. #5941
  • Defects fixed:
  • Image comparisons now support TIFF files. #5957
  • Comparison history lists now show three columns of history when Merge is using an evaluation serial number. #5954
  • In comparisons, both Shift+F10 and the keyboard context menu key (where present) now open the context menu. #5951
  • Double-clicking an empty folder comparison pane no longer causes a crash. #5993

New in Araxis Merge 2020.5310 (Feb 12, 2020)

  • Enhancements:
  • Merge is now fully supported, optimized, and tested on the forthcoming Windows 10 20H1 Update, barring any breaking changes from Microsoft. Support for Windows 10 20H1 replaces that for Windows 7, which is now end-of-life. Customers who wish to continue to use Merge on Windows 7 may, of course, use an older version of Merge (2019.5254 or earlier) that works with that platform. #5862#5873#5921
  • This release features a new implementation of the ribbon interface. This was required to support the Windows 10 dark theme without using private Windows APIs (see also the related fixed defect below), but the change has enabled other improvements: #5862#5843#5920
  • The new ribbon consumes significantly less vertical space than the old implementation, leaving more room on screen for comparisons.
  • A new Options…?Application?Display?Show group labels in the ribbon preference enables you to hide the text labels underneath each group of buttons in the ribbon, further saving vertical space. The group labels also hide automatically when the application window is too narrow to show all the ribbon button text.
  • The revised design reduces visual clutter.
  • Selected items on various dynamically populated ribbon submenus (e.g. the text comparison Options ? Expressions submenu) are now indicated simply using a check mark. The constraints of the old ribbon implementation forced a more convoluted scheme.
  • The experience of using Merge with the updated ribbon should continue to be familiar for most users. However, you are strongly encouraged to read the Making the Most of the Ribbon (Merge 2020 and later) topic, especially the Changes in Merge 2020 section. In particular, please note the comments there concerning removed support for ribbon Alt-key sequences.
  • Support for the Windows Subsystem for Linux (WSL) has been considerably enhanced and extended: #5401
  • WSL 2, available on Windows 20H1, is now fully supported in addition to WSL 1.
  • Non-default mount points and WSL UNC paths (i.e. those beginning \wsl$) are supported. This means that Merge is able to access and modify files directly within the Linux WSL filesystem on Windows 10 May 2019 Update (1903) and onwards, resulting in a virtually seamless experience.
  • As a result of these enhancements, the instructions for integrating Merge with Git and Mercurial under WSL have changed. Please carefully review the relevant new instructions if you use Merge with WSL:
  • Git WSL (Windows Subsystem for Linux)
  • Mercurial WSL (Windows Subsystem for Linux)
  • The Git integration instructions have been updated with helpful aliases and usage examples. Please review the revised documentation carefully if you use Git with Merge. #5879
  • The application and document icons have been modernized with a fresh yet familiar appearance. In addition, a new tile icon is provided for when Merge is pinned to the Windows Start menu. #5871
  • The various comparison file and folder opening dialogs now remember the last opened location individually for each comparison pane. #5757
  • The new 450% and 500% standard user-interface scale factors introduced with Windows 10 20H1 are supported, in addition to the previously supported 100%, 125%, 150%, 175%, 200%, 225%, 250%, 300%, 350%, and 400% scale factors. #5877
  • By default, fresh installations of Merge now open folder comparisons with the Two-way with file comparison layout. Please see the Comparing Folders topic for more information. As before, Merge endeavours to remember the preferred folder comparison layout when opening new folder comparisons. #5890
  • Items on the folder comparison ribbon Hide/reveal drop-down menu have been renamed to help distinguish those that reflect a persistent application state from those that are one-off commands. #5899
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to 13.0.1. #5827
  • The Merge major version has been updated to 2020, to reflect the year of release. Copyright notices have been updated accordingly. #5876
  • Defects fixed:
  • The application window caption bar and window frame are now themed correctly on the forthcoming Windows 10 20H1 Update when using the dark Windows theme.
  • The previous version of Merge used undocumented, private Windows APIs to achieve proper theming, resulting in an incompatibility when Windows 20H1 changed one of those APIs. With the new ribbon, caption bar, and frame implementation, Merge no longer uses private Windows APIs for its theme support. This should avoid any such problems recurring in the future.
  • Please see the Changes in Merge 2020 section of the Making the Most of the Ribbon (Merge 2020 and later) topic for more information about these changes.
  • Finally, note that the new window frame implementation unavoidably has a small amount of padding around the inside of the application border when Merge is running on Windows 8.1 (but not on Windows 10). This should not affect usability. #5862
  • Status-line change counts are once again correct following the swapping of folder panes. #5906
  • Comparisons with numeric data now give correct results when the difference between two numbers being compared is equal to the specified absolute tolerance. #5934
  • The keyboard accelerators for items in the context menu of file comparison linking-lines panels now work. #5908
  • The checkbox label in the Update available notification message is no longer clipped at higher user-interface scale factors. #5867
  • The Japanese localization of the Register Araxis Merge for all users on this computer label on the Register Araxis Merge dialog is no longer clipped at higher user-interface scale factors. #5931
  • The SCM server login credentials notification message no longer displays a Merge evaluation icon on non-evaluation versions of Merge. #5936

New in Araxis Merge 2019.5310 (Feb 11, 2020)

  • Enhancements:
  • Merge is now fully supported, optimized, and tested on the forthcoming Windows 10 20H1 Update, barring any breaking changes from Microsoft. Support for Windows 10 20H1 replaces that for Windows 7, which is now end-of-life. Customers who wish to continue to use Merge on Windows 7 may, of course, use an older version of Merge (2019.5254 or earlier) that works with that platform. #5862#5873#5921
  • This release features a new implementation of the ribbon interface. This was required to support the Windows 10 dark theme without using private Windows APIs (see also the related fixed defect below), but the change has enabled other improvements: #5862#5843#5920
  • The new ribbon consumes significantly less vertical space than the old implementation, leaving more room on screen for comparisons.
  • A new Options…▸Application▸Display▸Show group labels in the ribbon preference enables you to hide the text labels underneath each group of buttons in the ribbon, further saving vertical space. The group labels also hide automatically when the application window is too narrow to show all the ribbon button text.
  • The revised design reduces visual clutter.
  • Selected items on various dynamically populated ribbon submenus (e.g. the text comparison Options ▸ Expressions submenu) are now indicated simply using a check mark. The constraints of the old ribbon implementation forced a more convoluted scheme.
  • The experience of using Merge with the updated ribbon should continue to be familiar for most users. However, you are strongly encouraged to read the Making the Most of the Ribbon (Merge 2020 and later) topic, especially the Changes in Merge 2020 section. In particular, please note the comments there concerning removed support for ribbon Alt-key sequences.
  • Support for the Windows Subsystem for Linux (WSL) has been considerably enhanced and extended: #5401
  • WSL 2, available on Windows 20H1, is now fully supported in addition to WSL 1.
  • Non-default mount points and WSL UNC paths (i.e. those beginning \wsl$) are supported. This means that Merge is able to access and modify files directly within the Linux WSL filesystem on Windows 10 May 2019 Update (1903) and onwards, resulting in a virtually seamless experience.
  • As a result of these enhancements, the instructions for integrating Merge with Git and Mercurial under WSL have changed. Please carefully review the relevant new instructions if you use Merge with WSL:
  • Git WSL (Windows Subsystem for Linux)
  • Mercurial WSL (Windows Subsystem for Linux)
  • The Git integration instructions have been updated with helpful aliases and usage examples. Please review the revised documentation carefully if you use Git with Merge. #5879
  • The application and document icons have been modernized with a fresh yet familiar appearance. In addition, a new tile icon is provided for when Merge is pinned to the Windows Start menu. #5871
  • The various comparison file and folder opening dialogs now remember the last opened location individually for each comparison pane. #5757
  • The new 450% and 500% standard user-interface scale factors introduced with Windows 10 20H1 are supported, in addition to the previously supported 100%, 125%, 150%, 175%, 200%, 225%, 250%, 300%, 350%, and 400% scale factors. #5877
  • By default, fresh installations of Merge now open folder comparisons with the Two-way with file comparison layout. Please see the Comparing Folders topic for more information. As before, Merge endeavours to remember the preferred folder comparison layout when opening new folder comparisons. #5890
  • Items on the folder comparison ribbon Hide/reveal drop-down menu have been renamed to help distinguish those that reflect a persistent application state from those that are one-off commands. #5899
  • The subset of the OpenJDK Java Runtime Environment bundled with Merge has been upgraded to 13.0.1. #5827
  • The Merge major version has been updated to 2020, to reflect the year of release. Copyright notices have been updated accordingly. #5876
  • Defects fixed:
  • The application window caption bar and window frame are now themed correctly on the forthcoming Windows 10 20H1 Update when using the dark Windows theme.
  • The previous version of Merge used undocumented, private Windows APIs to achieve proper theming, resulting in an incompatibility when Windows 20H1 changed one of those APIs. With the new ribbon, caption bar, and frame implementation, Merge no longer uses private Windows APIs for its theme support. This should avoid any such problems recurring in the future.
  • Please see the Changes in Merge 2020 section of the Making the Most of the Ribbon (Merge 2020 and later) topic for more information about these changes.
  • Finally, note that the new window frame implementation unavoidably has a small amount of padding around the inside of the application border when Merge is running on Windows 8.1 (but not on Windows 10). This should not affect usability. #5862
  • Status-line change counts are once again correct following the swapping of folder panes. #5906
  • Comparisons with numeric data now give correct results when the difference between two numbers being compared is equal to the specified absolute tolerance. #5934
  • The keyboard accelerators for items in the context menu of file comparison linking-lines panels now work. #5908
  • The checkbox label in the Update available notification message is no longer clipped at higher user-interface scale factors. #5867
  • The Japanese localization of the Register Araxis Merge for all users on this computer label on the Register Araxis Merge dialog is no longer clipped at higher user-interface scale factors. #5931
  • The SCM server login credentials notification message no longer displays a Merge evaluation icon on non-evaluation versions of Merge. #5936

New in Araxis Merge 2019.5254 (Nov 13, 2019)

  • Enhancements:
  • Merge has a new option to save the current workspace of all open comparisons when it exits automatically due to a Windows sign-out or restart. The saved workspace is restored when Merge is next launched. Merge can also save the workspace at a specified interval, enabling recovery should Merge unexpectedly exit due to a problem such as a power failure. Finally, the comparison workspace can be manually saved using the ribbon File?Save workspace and exit command. For more information, see Application. #5705#5838#5840#5845
  • Comparisons of text with numeric data now support matching with a ratio tolerance in addition to the existing absolute tolerance. For more information, see Text Comparisons. #5659
  • The progress of long-running comparisons is now indicated in the Merge taskbar icon. #5681
  • When comparing folders on case-sensitive file systems, Merge now pairs file and folder names with matching case in preference to file and folder names that differ in case but otherwise match. #5691
  • Overlapping semantic element links are now resolved by preferring to create links with elements in the left-hand pane, rather than the right-hand pane. This should improve the overall results of semantic element linking #5834
  • Scrolling within text comparisons is now faster when in panning mode (toggled using the middle mouse button). #5654
  • When sorting on a folder comparison column, rows that have no value or the same value in that column (e.g. several rows that have the same number of changes when sorting on the changes column) are now sorted within that block in ascending alphabetical order based on their filename. #5754
  • The performance of finding text in XML files with very long lines has been improved. #5708
  • The Merge shortcut in the Windows Start menu now sets the working directory to the Merge installation directory. #5725
  • When Merge.exe is run as an Automation server, such as when using the /Automation and /Embedding switches, the working directory is set to the first directory found out of %USERPROFILE%Documents (CSIDL_PERSONAL) and %USERPROFILE% (CSIDL_PROFILE). If Merge.exe is not run as an Automation server, it will inherit the working directory of the calling process. #5725
  • The middle dot character is now used consistently as a separator within status line text. #5784
  • An Automation client holding a comparison object reference no longer prevents its comparison tab from being closed. #5801
  • The OpenJDK Java Runtime Environment bundled with Merge has been upgraded to 12.0.2. #5706
  • Defects fixed:
  • The Working copy label in comparison version lists has been localized. #5676
  • Drag-selection is now cancelled within a folder comparison when the results pane loses focus (e.g. due to the appearance of a save dialog). #5712
  • The … browse button in the folder comparison Copy files dialog now moves correctly when the dialog window is resized. #5748
  • Comparison statistics dialogs no longer behave strangely when resized. In addition, the size of buttons in this dialog when using the Japanese localization of Merge is now correct. #5851
  • Changing the user-interface theme without restarting Merge no longer results in a resource leak that could eventually lead to a crash. #5790
  • The linking-lines context menu is now themed correctly even if the theme is changed within Merge without a restart. #5764
  • The Binary linking lines colour field is now updated appropriately when the user interface theme is updated while the options dialog is open. #5852
  • The message text in the folder comparison Files and folders progress dialog no longer shows an inappropriate input cursor. #5749
  • Error messages arising from launching Merge via the Explorer Compare with Araxis Merge command are now more informative. #5792
  • Spurious console warnings are no longer emitted when integrating Merge with Git under the Windows Subsystem for Linux (WSL) on more recent Windows versions. #5788
  • A problem has been fixed with the conversion of synchronization link colour preferences when loading or saving a legacy options file. #5825
  • Syntax highlighting colours are now correctly restored when loading a saved comparison. #5859

New in Araxis Merge 2019.5187 (Jun 12, 2019)

  • Enhancements:
  • Multiple folders may now be selected and opened from open folder dialogs. #5601
  • A single file may now be opened from comparison history lists by holding Ctrl and double-clicking it. As before, double-clicking a row in a history list without holding Ctrl loads all the files in that row. #5692
  • Very large files load into text comparisons significantly more quickly than before. #5694
  • The integration instructions for Git Extensions, SmartGit, and TortoiseGit have been updated. #5486
  • Defects fixed:
  • The Versions button is no longer sometimes inappropriately disabled when Git revisions are available. #5689
  • Pressing Ctrl+Backspace in a file or folder entry field once again deletes the word preceeding the input caret. #5693
  • The Japanese localization has been brought up-to-date. #5700
  • Japanese characters in print header and footer edit fields now appear correctly. #5701
  • Merge no longer crashes when saving the text of a file whose content has been filtered with one of the supplied text-content filters. #5703

New in Araxis Merge 2019.5174 (May 2, 2019)

  • Enhancements:
  • Windows 10 dark mode is now supported on Windows 10 October 2018 Update (build 1809) and later with an optional dark theme for the Merge user interface. This is in addition to the pre-existing light theme. Please see the User-interface theme topic for details and limitations. Note too that some light-theme icons and bitmaps may have minor visual changes as a result of this work. #1041#5618#5565#5587#5670#5647#5648#5649#5650#5651
  • All standard Windows 10 user-interface scale factors (100%, 125%, 150%, 175%, 200%, 225%, 250%, 300%, 350%) are now supported, plus 400% for good measure. Previously, the Merge user interface only scaled well up to 200%. Merge should now therefore work better with very high DPI monitors and for users who have a visual impairment. #1041
  • A new Automatically link recognized semantic elements (functions, classes, etc.) option creates synchronization links between recognized semantic elements (e.g. function and class definitions) in certain types of files. This can improve the quality of comparison results for supported files. Automatically added synchronization links are coloured grey, rather than the usual blue, thus distinguishing them from manually added links. Please see the related legal notice. #5573
  • Comparison history lists (opened using the Show history button) have changed from a pane-specific list of previously loaded files to a unified list showing all the files involved in each prior comparison. This enhancement brings Merge for Windows into line with Merge for macOS. #5662
  • The Versions button no longer opens a separate dialog, but instead displays versions in way similar to the comparison history list opened by the Show history button. This brings Merge for Windows into line with Merge for macOS. #5675
  • The included Oracle Java Runtime Environment has been replaced with portions of the Java SE Runtime Environment (JRE) from the Oracle OpenJDK Version 12. Optional JRE files not required by Merge file-type filters are no longer included with Merge, resulting in significantly smaller Merge installer downloads. Please see the revised legal notice. #1949#5392#5515
  • Support for running Merge on 32-bit versions of Windows has been removed. We apologize for any inconvenience that this may cause. This change was necessitated by the switch to a modern Java SE Runtime Environment (see above), and also enables various optimizations. Customers who require Merge on 32-bit Windows may, of course, continue to use earlier versions of Merge indefinitely. #5420
  • A new option, Options…▸Folder Comparisons▸Follow (non-recursive) links has been added. When checked, Merge folder comparisons follow file-system links to other folders. #5534
  • The Use high-contrast marks in overview strips option has been replaced by the ability to configure overview strip colours. This change is related to the introduction of the dark user-interface theme. #5660
  • Comparison entry-field autocompletion lists have been improved: file or folder icons are shown next to completion entries and folder comparison auto-completion lists show only folders. In addition, Ctrl+A works consistently to select all the text in a comparison entry field. #5544
  • The storage of Merge options has been completely overhauled: #5566#5563
  • Merge options are now saved by default as a JSON file. (The previous format continues to be supported for interoperability with earlier versions of Merge.)
  • Merge theme settings (i.e. colours and fonts) can now be saved and loaded separately from other options.
  • Separate colour and font options are stored for light and dark themes.
  • Complex (array and map) options in the registry are stored in JSON.
  • Registry colour preferences use the HTML #RRGGBB string format, although the older REG_DWORD format is also supported.
  • Due to these changes, scripts and programs that use the Automation API to read or change Merge options should be reviewed for compatibility with this version of Merge. In particular, please see the revised ConfigLong Enumeration and ConfigString Enumeration topics.
  • A new Force equal character spacing option addresses certain problems with incorrect tab alignment. For further information, please see Editing. #5589
  • Folder comparisons are now able to pair filenames that appear the same but have differing Unicode representations. Exact Unicode code point matches are preferred to normalized matches. #5610
  • Dark mode support has necessitated the reworking of the open and save dialogs for file comparisons. #5678
  • On Windows 7, light grey replaces Windows 7 light blue for tabs and panel backgrounds. This is a side-effect of the new support for a dark theme. #5593
  • The possibilities for long-running file input/output operations to block the user interface have been significantly reduced. #5632
  • When comparing text files for patching, if a patch from a file containing multiple patches has previously been opened, a new Open patch file… toolbar menu Select patch… item can be used to select a different patch without having to open the patch file again. #5664
  • Reports generated using the .NET assembly now include all the summary sections of reports generated via the Merge user interface or Automation API. #5474
  • Source code for the araxissvnmerge utility is now included in the C++ Automation API examples. #5674
  • The Merge installer has been upgraded to use the WiX toolset v4. #5607
  • The Merge major version has been updated to 2019, to reflect the year of release. Copyright notices have also been updated accordingly. #5606
  • Defects fixed:
  • The colours used for change highlighting in three-way text comparisons are now indicative relative to the common ancestor. #5554
  • Folder comparisons are now able to recurse into a local Microsoft OneDrive directory. #5666
  • Next/previous bookmark/conflict/edit navigation now centres on the target line, rather than merely scrolling it to be visible. #5579
  • Using Ctrl+Page Up in the left panel of the text comparison of a split-view folder comparison to navigate to a prior file that ends with an inserted block of lines now works correctly. #5572
  • Connections to Subversion servers have been serialized, greatly reducing the possibility of folder comparisons failing due to a Subversion server dropping multiple concurrent connections. #5634
  • File icons are no longer sometimes missing in folder comparisons that access a Subversion server. #5635
  • Runs of three or fewer unchanged bytes in a binary comparison are no longer coalesced into a surrounding change. #5585
  • The first change is now shown when a new three-way binary comparison is performed. #5460
  • Files are now only passed through the relevant filter program if the comparison is of the configured type. For example, if a file type is configured to pass files matching the pattern *.doc through the doc2TextFilter.cmd filter for text comparisons, .doc files will no longer be passed though the filter when opened in a binary comparison. #683
  • The file comparison of a split-view folder comparison now always compares the files relating to the currently selected row in the folder comparison. Previously, there were certain scenarios where it was possible for the file comparison to become stale. #5453
  • Split-view folder comparisons launched for folders containing a single file now work correctly. #5478
  • The Git filesystem plugin is now able to supply revision lists for files even with recent versions of Git. #5525
  • Changes in character layout have been made to reduce the problem of characters within a text comparison line moving slightly as text is selected. #5620
  • HTML reports are generated in the configured Merge user-interface language. In the previous release, they were always generated in English. #5612
  • Merge now attempts to show in-panel error messages in the configured Merge user-interface language. Previously, Merge would use the Windows language setting, which could result in a mismatch between the Merge user-interface language and in-panel error messages shown by Merge. #5490
  • The spin control for the Dim resolved text by option is once again positioned within the relevant edit field and sized correctly. #5622
  • Editing within three-way comparisons containing synchronization links is now more robust. #5553
  • Minor corrections have been made to various user interface labels and messages. #5663#5619
  • Items for newly opened comparisons in the tab-strip drop-down menu and window list dialog now always match tab labels. #5592
  • Items in the context menu for the Merge taskbar icon have been localized into Japanese. #5645
  • Two dialogs with long messages now have their text appropriately line-wrapped. #5591
  • The FTP documentation has been corrected. #5595
  • Potential (though unlikely) problems with simultaneous access to Merge options from multiple threads have been fixed. #5566#5564

New in Araxis Merge 2018.5059 (Sep 12, 2018)

  • This major new release introduces a new comparison type for viewing and applying patch files. It also features numerous other enhancements, including optional word-based comparison and highlighting. Multiple defects are also fixed.
  • Enhancements:
  • A new comparison type offers a flexible toolkit for viewing and applying patch files. For screenshots and comprehensive documentation, please see Comparing Text Files for Patching. #5404#5492
  • Text comparisons have a new Unified diff ribbon button to create and preview a unified diff for the comparison. For more information, see Comparing Text Files (or Typed/Pasted Text). #5439#5487
  • Lines may now optionally be compared and highlighted based on words, rather than characters. #3273#5483
  • Syntax highlighting support for Scala (.scala) files has been added. #1944
  • Folder comparisons have a new option, Apply filters when copying the contents of folders. This determines whether active filters affect the files within folders that are copied between columns of a folder comparison. For more information, see Folder Comparisons. #2772
  • Merge now defaults to the UTF-8 character encoding (without BOM). #2936
  • Detection of resource encodings for .RC files via #pragma codepage directives is now automatically disabled for resource files that begin with a Unicode byte-order mark (BOM). #5434
  • Context menu items, window captions, and buttons have been converted to sentence (rather than title) capitalization. #5423
  • The registration dialog has been reviewed for GDPR-compliance and updated. Personal information is no longer required to activate Merge for Windows on a computer. The registration dialog itself explains how any personal data that is provided will be used. Finally, the dialog no longer has an option to give Araxis permission to email users about product updates, since the built-in update-notification mechanism obviates the need to send update emails. #5426
  • Merge no longer sends to Araxis information about locale, operating system version, screen size, and Internet Explorer version. #5426
  • To avoid complicating GDPR compliance, Merge no longer gathers crash reports. Neither does Merge therefore offer to send crash reports to Araxis. #5428
  • Image and binary comparisons now display panel titles (when appropriate) in place of filename entry fields. Panel titles for these types of comparison thus now work in the same way as they do for text comparisons. #5441
  • Merging buttons are no longer displayed when their actions would modify a read-only file and the editing of read-only files has not been enabled. #5442
  • Informational messages in file panels are shown for significantly longer before they disappear than in previous releases. #5445
  • Merge now tries much harder to show meaningful information in tab labels. The relevant full paths or titles are shown in tab-label tooltips, even if extremely long. #5484
  • Long-running file comparisons performed during a folder comparison now stop immediately if the folder comparison is cancelled. #5466
  • Folder comparison performance has been further enhanced. #5443
  • The wording and capitalization of file type names shown on the File Types page have been made more consistent. #5390
  • The lists of pre-canned file types in various file dialogs have been modernized. #5425
  • The operation of the FilterFileType Object API is now far more consistent with that of the RegularExpression Object. We apologize for any inconvenience that this backwards-incompatible API change may cause. #5447
  • Saved comparisons opened via the Automation API no longer prompt the user whether to use embedded saved options. #5469
  • The generation of line endings when saving files is more efficient. #5448
  • Merge no longer tries to upgrade settings from Merge 6.5 or earlier. #5485
  • The Boost library used by Merge has been updated to version 1.66. #5440
  • Defects fixed:
  • Folder comparisons are now able to copy files into the root directory of a drive volume. #5488
  • The Merge installer and uninstaller no longer use the Windows Restart Manager. This avoids a problem with the Windows 10 April 2018 Update where the Windows Desktop fails to restart following installation or uninstallation. #5455#5407
  • The first change is now shown when a new three-way file comparison is performed. #5460
  • It is easier to grab the resize handle between the upper and lower portions of a split-view folder-comparison-with-file-comparison at 200% UI-scaling. #5444
  • The panel resize-thumb is no longer incorrectly positioned after switching a file comparison from horizontal to vertical layout. #5438
  • Unified-diff file-comparison reports no longer emit content lines for comparisons of identical (unchanged) files. #5446
  • A rare situation where line-equality checking could behave incorrectly with the Treat consecutive whitespace as a single space option enabled has been corrected. #5450
  • A defect with inline comparisons has been resolved that could theoretically occur in certain situations involving zero-length lines. #5477
  • Registration information transmitted securely to Araxis is now properly URL-encoded. #5431
  • Merge no longer sends redundant placeholder registration information to Araxis. #5432
  • In the Japanese localization of the Merge user interface, the label of the 完全なフォルダー階層を比較する(C) option is no longer clipped at 200% UI-scaling. #5472
  • The copyright notice in the Japanese localization of the About Araxis Merge dialog has been corrected. #5491

New in Araxis Merge 2017.4988 (Mar 14, 2018)

  • This is a major new release featuring significant enhancements such as optional vertical padding in text comparisons, greatly improved line-pairing within blocks of changed text, and support for line-pairing rules. This release also fixes several defects, as well as providing various other enhancements. Please read the release notes carefully for a complete list of changes.
  • This is the current production-quality release and is recommended for all users.
  • This release is free-of-charge to all customers with upgrade/support entitlement covering the build date indicated in the download box below, including everyone who purchased Merge within the year prior to that date.
  • System requirements
  • Warning Araxis is considering dropping support for 32-bit versions of Windows in a future version of Merge. (This would mean that new versions of Merge would only run on 64-bit versions of Windows.) We are seeking feedback as to whether this change would be disruptive for customers. Please therefore contact Araxis if it is important for you or your organization to be able to run the latest version of Merge on 32-bit versions of Windows.
  • This release is tested and supported on the following platforms:
  • Windows 10 Fall Creators Update (32-bit and 64-bit)
  • Windows 8.1 (32-bit and 64-bit)
  • Windows 7 SP1 (32-bit and 64-bit)
  • The following platforms are also supported and expected to work, but not routinely tested:
  • Windows Server 2016
  • Windows Server 2012 R2
  • Windows Server 2012
  • Enhancements
  • A new option adds vertical padding to text comparisons. When enabled, every related block of changed or unchanged text always remains vertically aligned, regardless of scrolling. For more information (including a screenshot of this option in effect), see Comparing Text Files (or Typed/Pasted Text). I15095
  • The pairing of lines within blocks of changed text is now both configurable and much more intelligent. This improves the highlighting of comparison results within blocks of changed text in a wide range of scenarios. For full details, please read the Line Pairing topic. I15107I15150I15159I15161
  • Support for line-pairing rules has been added. Line-pairing rules enable Merge to pair corresponding lines in a block of changed text based on particular portions of a line matched by a given regular expression. Judicious use of line-pairing rules can provide excellent results for certain comparisons (e.g. those of localization files in different languages) that previously provided unhelpful results. For further information, see the Line Pairing and Edit Line-Pairing Rule topics. I15107
  • Line-pairing within change-blocks is tuneable, both for performance and for choosing a balance between highlighting a pair of lines as a change rather than as a removal and an insertion. For more information, please see Advanced Line-Pairing Options. I15107
  • A new Intelligently split blocks of changed text based on matched line pairs option has been added. When checked, Merge will endeavour to split multiline blocks of changed text into smaller blocks of inserted, removed, and changed text. This splitting is performed intelligently, based on any corresponding pairs of lines that Merge is able to match within the original block of changed text. This option can be very useful in understanding precisely how the compared files are related, and it can also make it easier to propagate individual changes from one file to another. For more information, please see Line Pairing. I15107
  • A new checkbox, Show detailed (rather than simple) inline changes within paired lines, is present on the Line Pairing options page. This replaces the Show simplified inline changes and Show detailed inline changes radio buttons on the Display options page in earlier versions of Merge. I15107
  • Following the completion of a text comparison, the status bar indicates notable options that could have significantly affected comparison results. The options potentially shown are: line-content expressions, column filters, line-pairing rules, adaptive line-pairing, and consecutive line-pairing. I15178
  • A progress indicator has been added to the status bar of long-running text and binary comparisons. I15164
  • Folder comparisons now show an icon adornment for each item that is a symbolic link to a file or folder, a shortcut to a file or folder, or a folder junction point. I15152
  • The context menu for both file and folder comparisons has a new item to show a file (or folder) in Windows Explorer. I15069
  • There is a new option on the Fonts and Colours page to disable the anti-aliasing of text in text and binary comparisons. I15094
  • The Merge user interface is now responsive during lengthy comparisons that have been launched using the command-line utilities. I15182
  • The behaviour of folder comparisons launched from the command-line utilities has changed slightly. When the /wait command-line argument is not explicitly or implicitly set, the utilities will wait for the comparison to finish before returning, rather than returning immediately after launching the comparison as before. For example, consolecompare /nowait largefolder1 largefolder2 will now wait for the comparison to finish (but not to be closed) before exiting. This change was made so that folder comparisons behave in the same way as file comparisons. 15183
  • The example HTML reports in the Japanese Windows documentation have been updated to use the UTF-8 character encoding. I15087
  • The Boost library used by Merge has been updated to version 1.65. I15179
  • The Libarchive library used by Merge has been updated to version 3.3.2. I15184
  • The Merge major version has been updated to 2018, to reflect the year of release. I15180
  • Defects fixed
  • Comparison of text files using numeric tolerance now works again. I15120
  • The folder comparison Retest selected feature no longer sometimes fails. I15146
  • Lines no longer sometimes wrap prematurely. I15154
  • An appropriate line-ending is now added when merging lines at the bottom of a file that does not end with a line-ending character or character pair. I15119
  • The processing of command-line arguments by Merge.exe has been improved to make it possible to launch a comparison of a file or folder whose name contains the string -options. Note that launching comparisons using Merge.exe is not recommended; see the Command-Line Reference for more information. I15118
  • The various Merge command-line utilities now offer to register Merge Automation objects when they detect that they have not already been registered. Previously, the utilities could crash in those circumstances. I15177
  • Certain registry keys created by the Merge installer are now placed in the correct location. I15133

New in Araxis Merge 2017.4940 (Nov 18, 2017)

  • This release fixes several defects and provides minor enhancements. Please read the release notes carefully for a complete list of changes. It is the current production-quality release and is recommended for all users.

New in Araxis Merge 2017.4929 (Sep 19, 2017)

  • Enhancements:
  • The display of binary comparisons has been substantially improved. Individual changes are now shown inline, rather than being broken-out into separate lines. Linking lines are drawn between related changes, and the change under the text cursor or mouse pointer is highlighted. For more information, please see Comparing Binary Files. I15016I15030I15040I15054
  • When line wrapping is enabled, lines are wrapped just before they first come into view. This makes loading of larger files much faster than before when line wrapping is enabled, and brings Merge for Windows into line with the behaviour of Merge for macOS. Because of the improved performance, character-based line wrapping is now enabled by default for new installations of Merge. I15018I15034
  • On machines with multicore processors and fast storage media (e.g. SSDs), folder comparisons are much quicker (more than twice as fast on our test machines). I15019
  • Merge now integrates with Mercurial and Git running under the Windows Subsystem for Linux (WSL). Note that WSL integration requires that all repositories and files accessed by Merge be stored on the Windows filesystem (e.g. under /mnt/c, from the perspective of WSL). I14977
  • For three-way text comparions, a new Mark conflicts ribbon command has been added. This will mark potential automatic-merging conflicts without first performing a merge-to-common-ancestor operation. I14898
  • Optional special handling for Intel Hex files has been added. I15010
  • The integration instructions for Git and Mercurial have been updated to specify file panel titles. I14976
  • The Windows dialog (opened from the tab drop-down menu when more than 20 tabs are open) makes better use of available width to display long paths. I14901
  • The default behaviour for clicking on a change within a scroll bar is now to move to that change/position, rather than to move upwards or downwards by a page. I15034
  • In binary comparisons, the offsets of existing synchronization links in binary comparisons may now be edited via the link’s context menu Edit Synchronization Link… item. I15014
  • Character-encoding support for file loading and saving is now more robust. I15017
  • Support for the following character encodings has been added: I15017
  • Unicode (UTF-16LE without BOM),
  • Unicode (UTF-16LE with BOM),
  • Unicode (UTF-16BE without BOM),
  • Unicode (UTF-16BE with BOM),
  • Unicode (UTF-32LE without BOM),
  • Unicode (UTF-32LE with BOM),
  • Unicode (UTF-32BE without BOM),
  • Unicode (UTF-32BE with BOM).
  • The following obsolete encodings have been removed: I15017
  • Unicode (UCS-2LE without BOM),
  • Unicode (UCS-2BE without BOM),
  • Unicode (UCS-2LE with BOM),
  • Unicode (UCS-2BE with BOM).
  • Merge may be installed from the command-line for all users without also installing the Araxis Snapshot Service service. For more information, see How to Install. I14954
  • Single quotation marks may be used when specifying titles on the command-line. I14903
  • Access to inline changes has been added to the .NET assembly. I14983
  • The .NET assembly text comparison CompressConsecutive option has been replaced by a TreatWhitespaceRunsAsSingleSpace option. This is more generally useful, and matches the equivalent option in the Merge application. I14922
  • The Automation API example scripts have been updated to use the new regular expression objects introduced in an earlier release. I14994
  • The included Oracle Java Runtime Environment has been updated to version 1.8 Update 141. I14996
  • Defects fixed:
  • Comparisons with numerical data tolerance no longer ignore differences outside of the intended range in some circumstances. I14899
  • When recomparing a folder comparison of zip archives, Merge correctly detects any changes in the contents of the archives. I14929
  • When adding a synchronization link to a binary comparison, the offsets specified in the Add Synchronization Link dialog are properly interpreted as hexadecimal numbers. Previously, they were incorrectly parsed as decimal. I15015
  • .NET assembly text comparisons accept files that terminate with a r (CR) character. I14908
  • .NET assembly text comparisons can compare empty files or strings without generating an error. I14907
  • .NET assembly text comparisons give correct results when ignoring embedded whitespace with line endings being treated as significant. I14918
  • .NET assembly text comparisons correctly process leading and trailing whitespace when CompressConsecutive and IgnoreEmbedded options are both set. I14921
  • A text comparison of two identical files will always now show some context when two identical files are compared with the Show only # lines of context around changes option checked. I15035
  • A new registry setting, CheckForExternallyModifiedFiles, has been added. When set to 0 (the default is 1), unwanted <file> has been modified outside of Merge. Would you like to reload it? messages are no longer shown in certain circumstances after closing the Merge application window. I14914I15034
  • The column headings in the Options…▸Text Comparisons▸Expressions page have been corrected. I14943
  • The Help button on the Options…▸Folder Comparisons page opens the correct help page. I14892

New in Araxis Merge 2015.4664 (Oct 7, 2015)

  • Enhancements:
  • Windows 10 is a fully tested and supported platform.
  • Archive files (e.g. .zip, etc.) may be opened in a folder comparison using the Compare with Araxis Merge and Queue for Comparison Windows Explorer context menu. For this to work, the Process archives option must be enabled within Merge.
  • Overview strips and markers now appear above the vertical scrollbar thumb, and thus are no longer obscured by it.
  • This release of Merge is expected to work on Windows Vista, though Vista remains an unsupported platform.
  • The configuration of comparison fonts and colours has been simplified.
  • The default focus of the Save Modified Files dialog has been changed from the listbox to the Yes button.
  • A new ReportOptions class has been added to the Merge .NET assembly to enable the fonts and colours of HTML reports to be configured. Use the Visual Studio Object Browser to view the relevant documentation for the the Merge .NET assembly.
  • The types of URL that can be used with the Save file to URL, Open file from URL and Open folder URL dialogs are now documented.
  • If you wish to use the Araxis Snapshot Service to view file versions stored by Windows System Protection, please see the Windows 10 section of the Accessing Versions Stored by Windows System Protection or the Araxis Snapshot Service page.
  • The folder comparison ribbon Re-test selected item has been renamed to Retest selected.
  • Merge no longer uses the Boost library.
  • Defects fixed:
  • When performing a new comparison, Merge jumps to the first change (if any), as it did in certain earlier versions of Merge.
  • Merge is now able to reformat HTML containing elements with attributes that have no value.
  • The New Text Comparison, New Binary Comparison, New Image Comparison and New Folder Comparison items on the context menu of the Merge taskbar icon now work on Windows 10.
  • The right-hand overview strip is appropriately updated when changing from a 3-way to 2-way binary comparison.
  • A problem with compare.exe and truncated UNC paths in a folder comparison has been fixed.
  • It is no longer possible to type anything but digits into a binary comparisons Search size field.
  • The non-functional Save to URL… button has been removed from the Choose Report File dialog.
  • Registration information is now sent directly (using HTTPS) to the relevant Araxis server, rather than first redirecting via an HTTP URL

New in Araxis Merge 2015.4634 (Jun 4, 2015)

  • Enhancements:
  • The contents of a variety of archive formats (.zip, .tar, etc.) can be directly compared. See Comparing archive files as if they were folders and Files stored in an archive.
  • Comparison overview strips have been incorporated into the background of the vertical scrollbars.
  • In a folder comparison with file comparison view underneath, pressing Ctrl+PgDn while on the last change in the file comparison will open the folder comparison’s next row of changed files in file comparison and navigate to the first change. Likewise, pressing Ctrl+PgUp while on the first change of the file comparison will open the folder comparison’s previous row of changed files in the file comparison.
  • The save dialog Save to URL… button has been resized/repositioned.
  • The included Oracle Java Runtime Environment has been updated to version 1.8.
  • Defects fixed:
  • Installing Merge without administrator privileges no longer causes Compare.exe to fail with a Registered class not found error.
  • In a binary comparison, the user interface no longer becomes stuck showing an error message dialog when a Search size containing non-digits is applied.
  • Launching new comparisons from a three-way folder comparison should now operate correctly in all circumstances.

New in Araxis Merge 2014.4565 (Dec 2, 2014)

  • Enhancements:
  • The Apache Tika library used by Merge to extract text from various types of files has been updated to the latest version. This should improve the ability of Merge to extract text from previously problematic files.
  • The ability to search backwards in text comparisons has been added.
  • If support has expired for the configured Merge serial number, the Update Available notification message will indicate if a new serial number with renewed support is required to use an available product update.
  • Files and folders can be dragged from a folder comparison by holding down the Alt key when initiating the drag operation. (The Alt key is required so as not to affect the pre-existing drag-to-select behaviour.)
  • Conflict, edit and bookmark markers are shown in overview strips.
  • The 32-bit version of Merge includes the 64-bit Windows Explorer context menu extension for use on 64-bit versions of Windows. This improves the compatibility of the 32-bit version of Merge when installed on a 64-bit version of Windows. Araxis continues to recommend using the 64-bit version of Merge on 64-bit Windows.
  • An additional Windows Registry location has been added for OEMs to specify startup preferences.
  • When necessary (as determined by Araxis support), Merge can be configured to skip problematic codepages and locales during startup and when populating codepage/locale lists.
  • A new Windows Registry value, HKEY_CURRENT_USER/Software/Araxis/Merge/7.0/TabCloseOnRight, has been added. When set to 1, tab close buttons will be located on the right side of the tab. This option is unsupported.
  • A limited, unsupported, as-is UI with old-style menus and toolbars has been reintroduced for users who have a strong aversion to the Ribbon. Please contact Araxis for details.
  • Defects fixed:
  • For long lines of text in a file comparison that are wrapped on to multiple display lines, line numbers are shown on the first (rather than last) displayed line of text.
  • Filters are correctly applied to files even when filenames have been entered with trailing whitespace.
  • It is possible to save and re-open a comparison workspace that contains a three-way folder-comparison-with-file-comparison.

New in Araxis Merge 2014.4531 (Sep 2, 2014)

  • Enhancements:
  • Merge fully supports Windows user interface scaling factors up to 200%, and suitable new high-resolution artwork is included. This enables Merge to be used comfortably on high-DPI displays.
  • The ribbon icons, other icons, merging buttons, markers and indicators have been redrawn to provide a modern uncluttered look, as well as to support high-DPI displays.
  • The merging buttons and the next/previous change buttons have been made visually distinct.
  • The file comparison and folder comparison instant overviews have been redesigned and are now interactive.
  • Merge no longer supports the obsolete Windows XP operating system. Dropping support for Windows XP has made it feasible to implement the significant UI enhancements in this release.
  • The old-style menu and toolbar user interface used on Windows XP has been removed. The documentation has been streamlined accordingly, as it no longer needs to accommodate two different user interfaces. Users migrating from Windows XP are encouraged to review the Making the Most of the Ribbon topic.
  • The light blue main window background colour used on Windows 7 is more subdued.
  • New folder comparison Two-way with file comparison and Three-way with file comparison layout options have been added. These split the display horizontally, with a file comparison shown beneath the folder comparison. Click on a row in the folder comparison to compare that row’s files in the file comparison below. (The capability to split a folder comparison was introduced experimentally in the previous release and is now mature.)
  • The tab strip has been completely redesigned to have minimal visual clutter and to provide more space in tabs to show the names of the files or folders being compared.
  • Clicking a comparison tab with the middle mouse button now closes the tab.
  • Pressing Ctrl+Tab or Shift+Ctrl+Tab now cycles through tabs rather than stopping at the last tab or first tab.
  • The maximum number of items in the tab strip drop-down comparison list menu has been increased from 10 to 20.
  • Installation without administrator privileges is supported.
  • The three folder comparison Copy selected ribbon sub-menus have been consolidated into a single menu.
  • The Layout ribbon group is now the second from the left for all comparison types. This reflects its importance and facilitiates greater UI convergence with future versions of Merge for OS X.
  • The physical size of the fonts used in comparisons remains consistent when the Windows UI scale factor is changed. (Users upgrading from an older version of Merge may need to edit and save their comparison font size options for this enhancement to take effect.)
  • The dotted rectangle indicating focus within file and folder comparison panels has been removed. Instead, the border of the focused panel turns blue. This reduces clutter and better matches the visual appearance of filename entry fields on newer versions of Windows.
  • There is no longer a 1 px wide gap around the contents of each comparison pane when using Windows themes that have a 1 px border width.
  • The vertical 1 px wide left and right workspace edges have been removed for a better visual appearance on modern versions of Windows, and to match the redesigned tab strip.
  • When a single line of a text comparison contains text of different sizes, all of the text now aligns to the text baseline.
  • Edit indicator icons are more visible when bookmark or conflict markers are present on the same lines.
  • The appearance of the Previous change and Next change buttons beneath the vertical scroll bars has been improved to fit better with Windows 7 and Windows 8 visual themes.
  • The system icon in the top left-hand corner of the application window has a border at higher Windows UI scale factors.
  • The appearance of the overview strips has been improved, as has the wording of the associated tooltip.
  • If a single file or folder is selected in Windows Explorer and the Compare with Araxis Merge context menu command is selected, a two-way comparison opens with the selected file or folder in both panels. This makes it easier to use Windows Explorer to compare a file or folder with an earlier version of itself using the Versions button.
  • The default linking line colour is fractionally lighter.
  • The default word-wrapping option is to wrap text by word.
  • The default text comparison font is Consolas, not Courier New.
  • The default text comparison whitespace option is to treat consecutive whitespaces as a single space, rather than to ignore all differences in whitespace. The new default is preferable as it is less likely to result in semantically meaningful changes being ignored.
  • The Applicable Styles list on the Syntax Highlighting options page is sorted alphabetically. This better groups related styles (e.g. the various types of comments for C-like languages).
  • The git-difftool option --dir-diff is documented in the instructions for integrating Merge with Git. This option opens a folder comparison showing all the changed files.
  • Instructions have been provided for integrating with the Git Extensions application.
  • Instructions have been provided for integrating with SourceGear Veracity.
  • The folder selection dialog for folder comparisons is much more capable. (The Windows OpenFolderDialog API is used rather than the older FolderBrowserDialog.)
  • The message that appears in a file panel when no file has been loaded is more succinct, and shows for 15 seconds rather than 10.
  • The text comparison Replace content ribbon menu has been made more analogous to the equivalent items in Merge for OS X.
  • The folder and text comparison context menus have been streamlined.
  • The visual consistency of various tooltips has been marginally improved.
  • The presentation of synchronization links has been improved.
  • Print previews no longer use old-fashioned 3D-effect borders.
  • The file/folder printing options header and footer edit controls have a thinner border, better suiting modern versions of Windows.
  • The tab strip menu disclosure button hover highlighting now uses appropriate theme colours on more recent versions of Windows.
  • HTML comparison reports now recommend viewing with a modern standards-compliant browser, instead of referencing specific browsers.
  • The plugin for the obsolete Microsoft Visual SourceSafe version control system has been removed.
  • When more than one serial number is available in the HKLM and HKCU Windows registry hives, Merge now selects the best one available. The order of preferred precedence is Professional > Standard > Evaluation > Invalid. This precedence remains in force even if the chosen serial number expires. Thus, for example, Merge will not begin using a Standard Edition serial number under HKCU if an expired Professional Edition serial number exists under HKLM.
  • It is possible to select the position of new tabs via a new registry setting, HKEY_CURRENT_USER/Software/Araxis/Merge/7.0/AddTabsToRight. When this is set to the default value of 0, new tabs are created to the left of all existing tabs in the window. When set to 1, new tabs are added to the right of all existing tabs in the window.
  • Setting the HKEY_CURRENT_USER/Software/Araxis/Merge/7.0/SimpleSideBySideChanges registry entry to 1 will cause Merge to perform a simple line-by-line text comparison, comparing equivalently numbered lines. Line 1 of the first file is compared with line 1 of the second file, line 2 with line 2, etc.
  • The two test images provided in the Merge installation directory have been updated to be suitable for high-resolution displays.
  • The major version number has been updated to 2014, reflecting the year of release.
  • Defects fixed:
  • When disabled, the Previous change and Next change buttons beneath the scrollbars are now always appropriately drawn.
  • A trailing ellipsis has been added to the Open saved options… ribbon menu item.
  • It is again possible to select a range of rows in a folder comparison by holding Ctrl while left-clicking and dragging the mouse.
  • New top-level windows may be opened using the ribbon interface.
  • The integration instructions for the Cygwin variant of Git have been modified to avoid a name clash.
  • The Save Modified Files dialog has been given a minimum height.
  • Saved comparisons preserve whether a comparison was three-way or two-way.
  • The Help button of the Go To Offset dialog window now shows the correct help page.
  • The Go to offset ribbon button is appropriately disabled when the binary comparison panel with focus does not have a loaded file.
  • The gaps to the left and right of the status bar information icon are no longer uneven.
  • The status bar prompt for the text comparison context menu Cut item has been corrected.
  • Status bar prompt text has been provided for the text comparison context menu Reopen Nth File with Encoding… item.

New in Araxis Merge 2013.4430 (Dec 13, 2013)

  • Enhancements:
  • Integration instructions have been provided for TortoiseGit.
  • The documentation has been completely overhauled to make it easier to read and navigate. It now resides primarily on the Araxis website, resulting in smaller download sizes and reduced disk space requirements, as well as facilitating enhanced searching and updates in-between product releases.
  • XML reformatting performance has been significantly improved for certain large XML files (the test case was comparing files of 280,000 lines).
  • When byte-by-byte comparisons are performed in folder comparisons, the count of changes shown for changed file pairs is ≥1 rather than 1.
  • The performance of detecting character encoding in Windows resource (.rc) files has been improved.
  • For text comparisons, the comparison engine will now load and begin processing (up to) all three files concurrently to improve comparison performance on multiprocessor machines.
  • A SaveWorkspace method has been added to the Application Automation object.
  • Line continuation indicators (shown when line-wrapping is off and a line is too long to be displayed in its entirety) are now drawn at a lower position on the line.
  • Default filenames are no longer assigned to file comparison panels when typing or pasting text into an empty panel. This means that a dialog will prompt for the save destination and filename if the file panel is saved.
  • The documentation for the Credentials options page has been clarified.
  • The Configuring a Windows paging file topic has been updated for Windows 8 and Windows 8.1.
  • The Enabling 3 GB of memory for 32-bit Merge on 32-bit Windows topic has been updated for Windows 8 and Windows 8.1.
  • The redundant Help button on the Print Setup dialog has been removed.
  • The About dialog uses the new Araxis logo.
  • The Boost library has been upgraded to v1.54.0.
  • Defects fixed:
  • Merge no longer crashes when a text file is dropped on to the left file panel of an image comparison.
  • Merge no longer freezes when comparing a non-existent folder from the command line using compare.exe.
  • Merge no longer fails in certain circumstances to show the Save Modified Files dialog on quitting.

New in Araxis Merge 2013.4377 (Aug 1, 2013)

  • Enhancements:
  • The automatic detection of character encoding in UTF-8 without a byte-order mark has has been improved.
  • Syntax highlighting performance has been greatly improved for text files containing extremely long lines (in the MB range).
  • Comparison performance has been improved for large text files.
  • Folder comparison performance has been improved.
  • The performance of pasting large amounts of text in a text comparison has been drastically improved.
  • XML reformatting performance has been significantly improved for very large XML files.
  • The Registration dialog now has a checkbox to set the serial number for all user accounts on the machine. Previously, this could only be done by editing the Windows registry.
  • The Application options page now has a checkbox to enable periodic snapshots to be turned on and off more conveniently.
  • Merge now treats Unicode character U+3000 (IDEOGRAPHIC SPACE) as whitespace for the purposes of ignoring or consolidating whitespace.
  • The Git plugin now works with new installations of msysGit release Git-1.7.11-preview20120620 and later.
  • The Integrating with Source Control, Configuration Management and Other Applications page has been updated with instructions for integrating with IntelliJ IDEA.
  • The Integrating with Source Control, Configuration Management and Other Applications page has been updated for latest version of WinCVS.
  • The folder comparison filter examples have been updated.
  • It is now possible to print only the filename (without the path) in the page header when printing a comparison.
  • When the AutomationIgnoreAllErrors registry key is set to 1, errors requiring manual intervention are supressed in folder comparisons launched using the Automation API.
  • The included the Oracle Java Runtime Environment has been updated to version 1.7.
  • Minor improvements have been made to the online help.
  • Defects fixed:
  • A crash has been fixed that could sometimes occur when clicking the Show Overview button on the first launch after a clean install.
  • A rare problem with regular expressions has been fixed that could lead to a crash when a merging button was clicked.
  • The text baseline in the Registration dialog fields have been aligned with corresponding field labels.
  • Horizontal scrolling in empty image and binary comparison panels has been disabled.
  • Merge now shows (via the Versions button) earlier revisions of Subversion files, even if they are from other branches. This is at the expense of showing previous revisions of deleted files.
  • The Versions button is now enabled and works correctly for files and folders that are local working copies of Subversion repository files/folders when checked out using either the file://, http:// or https:// protocols.
  • The icon caching thread no longer deadlocks during application shutdown.
  • A small dark grey rectangle no longer appears in status bar of folder comparisons.

New in Araxis Merge 2013.4296 (Feb 18, 2013)

  • Enhancements:
  • In the .NET assembly, it is possible to monitor the progress of comparisons using the new ProgressChanged event. For more information, see the Introduction to the .NET Assembly.
  • The amount of memory that can be used by the file comparison filters for Microsoft Office documents has been increased from 256 MB to 512 MB. This allows larger Microsoft Office documents to be compared without receiving out of memory errors. Please contact Araxis support for assistance if you still encounter out of memory errors when comparing large Microsoft Office documents.
  • Minor improvements have been made to the online help.
  • The major version number has been updated to 2013, reflecting the year of release.
  • Defects fixed:
  • Merge no longer crashes on Windows 8 when the application is launched by opening a saved comparison file and then choosing to load options.
  • Merge no longer crashes when opening images using the consolecompare utility with a /readonly flag.
  • When running a filter program, Merge now closes the handle to its input file before the filter program is started. This enables third-party filters to be used even if they need to open the input file with exclusive access.
  • Pipes may now be used within filter programs.
  • A crash that could occur when closing the main application window has been fixed.

New in Araxis Merge 2012.4260 (Nov 12, 2012)

  • Enhancements:
  • Merge is fully tested and supported on Windows 8.
  • A .NET assembly is included to provide certain text comparison services conveniently to .NET applications. For more information, see the Introduction to the .NET Assembly.
  • The End-User Licence Agreement for Araxis Merge Software has been updated to add specific provision for Merge to be deployed as a component of a server application that provides services to multiple users. This may be of interest to customers using Merge in their server-based applications via the Automation API or .NET assembly. In summary, deployment as a server component requires the purchase of two Merge licences rather than the one needed for normal desktop use, though you are referred to the full EULA for the definitive terms.
  • Access to files and folders stored by system restore points is now possible via the Versions button. A snapshot service is also provided to create additional scheduled restore points. For more information, see Accessing Versions Stored by Windows System Protection or the Araxis Snapshot Service. (Note that the documentation for this feature on this website is more recent than that included with the product.)
  • Various minor improvements have been made to the documentation.
  • For the benefit of visually impaired users, appropriate system colours are used when a high contrast Windows theme is selected. It may be necessary for users to reconfigure alternative text colours within Merge when certain high contrast themes are used.
  • When scrolling, mouse wheel acceleration is supported.
  • More detailed error messages are shown in certain circumstances when the FTP plugin encounters problems.
  • Serial numbers with support expiry dates after 2017 are supported.
  • Bug fixes:
  • The araxissvnmerge.exe command-line utility has been corrected to address problems encountered by some customers using Merge to resolve Subversion conflicts.
  • A three-way file comparison is no longer launched from a two-way folder comparison if a three-way folder comparison had been open previously.
  • A saved two-way comparison reopens with two comparison panes, not three.
  • It is possible to access a Perforce server using Windows or LDAP authentication without configuring a username or password in Merge.
  • The Automation API ComparisonResult property returns the correct result for binary comparisons where the files are identical.
  • A change to Options… > Application > Show file versions from SCM systems setting is now reflected immediately when applied, rather than requiring a restart.

New in Araxis Merge 2012.4198 (May 29, 2012)

  • Enhancements:
  • The icon on each comparison tab now turns into a close button when the mouse pointer is over the tab, as it does in the OS X version of Merge.
  • Following a folder comparison automatic merge operation, Merge no longer gives warnings about non-text files that could not be merged if it had indicated prior to the merge that they would be skipped.
  • File and folders are no longer added to the comparison history if they were located in the temporary files directory.
  • Memory handling has been optimized even further. This should help with performance, especially with large comparisons.
  • Merge is now able to access 3GB of RAM on 32-bit versions of Windows.
  • A new FAQ has been added, How can I increase the amount of memory that Merge can use for large file and folder comparisons?
  • Merge better handles many out-of-memory conditions.
  • Bug Fixes:
  • The … have been restored to the browse button in the Run Program dialog.
  • In the classic toolbar-style user interface, a problem with changing filters in a folder comparison using the toolbar drop-down has been resolved.
  • The type definition for IComparison* in the Automation API now references a valid help article.
  • Ctrl+Z works within comparison filename entry fields.
  • HTML reports no longer show the number of omitted unchanged lines if the Show number of omitted unchanged lines option is unchecked.
  • The tooltips for merging buttons now display correctly with Aero in Windows 7.
  • If the content of the Size & Time column in a folder comparison is too wide to fit into its column, it is now shortened with an ellipsis, rather than simply being truncated in a potentially misleading way.
  • Crash reports are generated correctly on 64-bit versions of Windows.
  • Merge now comes to the fore when launched from Windows Explorer using the Compare with Araxis Merge context menu item on Windows 7.
  • Merge copes gracefully when the Windows CopyFileEx function fails to copy files over a network where one of the folders is encrypted.
  • The object returned by the Automation API TextComparison.ThreeWayMergeActions property now works correctly.
  • Comparison tabs no longer become very narrow when content is typed directly into a text comparison.
  • The display format for binary comparisons persists when changing one of the files being compared.
  • In a binary comparison, it is now possible to reload a file that has been modified outside Merge.

New in Araxis Merge 2012.4162 (Feb 9, 2012)

  • Enhancements:
  • Merge is able to access files directly from Git and Mercurial repositories. For more information, please see the integration instructions for Git and Mercurial. [I13015]
  • Merge offers an in-process Automation server. This capability will be of interest to those using Merge from server based applications such as those hosted by Internet Information Server. As this feature is still very new, please contact us if you are interested in trying it. [I13082]
  • The folder comparison option Gather line count statistics for inserted and removed files is off by default. [I11874]
  • The Use filter program in folder comparisons option has been moved to the Folder Comparisons options page. [I11875]
  • The Additional Registration Details section of the registration dialog has been removed. [I12177]
  • The major version number has been updated to 2012, reflecting the year of release. [I13040]
  • Bugs fixed:
  • The Include only pages that contain changes option in the Print dialog now correctly omits pages that only contain lines ignored by matching by regular expressions. [I13057]
  • When unsaved changes have been made to files in a comparison, a manual recompare now prompts to save the files. [I12913]
  • In image comparisons, Ctrl+F4 will close the comparison, not the whole application. [I12424]
  • Two broken external links have been corrected in the online help. [I12932, I12966]
  • An inappropriate error message pertaining to Perforce is no longer shown in certain circumstances when endeavouring to view a file in a Subversion repository. [I12943]
  • Content no longer appears more than once in the centre panel of a three-way binary file comparison. [I13092]

New in Araxis Merge 2011.4074 (Oct 11, 2011)

  • Enhancements:
  • A new Versions button provides convenient access to other versions of a file or folder stored in Perforce, Subversion and Visual SourceSafe repositories. See the updated Comparing Text Files (or Typed/Pasted Text) topic for further details. [I12237, I12258, I12261, I12262, I12284, I12694, I12705, I12699, I12878, I12244, I12877, I12892, I12895, I12260, I12271, I12900]
  • Merge now has a single options page for storing all credentials for accessing SCM and FTP servers. This replaces the ad hoc dialogs that used to pop up when Merge needed login information. [I12696, I12695, I12700, I12701, I12702, I12703]
  • The command-line Compare.exe and ConsoleCompare.exe utilities now have an option to close comparisons automatically if there are no changes between the compared files. For more information, see the Command-Line Reference. [I12817, I12851]
  • Ctrl+A now works to select all the text in the filename and folder name entry fields. [I12078]
  • The start-up splash screen has been removed. This should result in Merge starting more quickly. [I12255]
  • The file patterns on the File Types options page now allow a literal filename with no wildcard to be specified. [I12371]
  • An option, Include ‘Compare with Araxis Merge’ in Explorer menus, has been added to the Application options page. This provides a way to turn off Windows Explorer context menu integration. [I12496]
  • The Frequently Asked Questions list has been updated with an entry, ‘How can I stop Merge from freezing when I right-click a file or folder comparison panel?’ [I12498]
  • The error message that is shown when p4.exe is unavailable for use by the Perforce plugin is now more helpful. [I12697]
  • Instructions for integrating Merge with the Cygwin version of Mercurial are now provided. [I12819]
  • The integration instructions for Visual Studio Team Foundation have been improved. [I12832]
  • The integration instructions for Mercurial now document the reason for using the /wait argument to ConsoleCompare.exe. [I12666]
  • The Visual SourceSafe File System Plugin topic now includes system requirements. [I12860]
  • The SCM integration instructions no longer reference the obsolete Visual Enabler Blue product. [I12210]
  • The SCM integration instructions have been updated to replace the entries for CM Synergy and Continuus with one for IBM Rational Synergy. [I12212]
  • The instructions for integrating Merge with ClearCase have been updated to reference a customer-contributed ClearCase/Merge integration application. [I12332]
  • The URI-based file open dialog that appeared in certain situations has been removed, since it provided little benefit over simply typing a URI into a filename or folder name entry field. [I12259]
  • Merge now uses v1.45 of the Boost library. The legal notices have been updated accordingly with the new version number. [I12303, I12293]
  • The trademarks section of the legal notices has been updated. [I12296]
  • The Legal Notices topic now references the Oracle JDK licence, not the Sun one. [I12516]
  • The Merge major version has been updated to 2011, and copyright dates extended accordingly. [I11526]
  • Bugs fixed:
  • The Maximize application on startup setting is no longer ignored when Merge is launched from Windows Explorer. [I9141]
  • It is now possible to choose the Hide/reveal button on the ribbon to reveal the associated drop-down menu when everything has been hidden. [I12217]
  • Very long lines of text (> 8,000 characters) no longer appear as blank lines. [I12222]
  • When performing an automatic folder merge operation that copies a file into the common ancestor where that file did not previously exist, Merge now preserves the character encoding of the copied file. [I12235]
  • Merge now displays very long lines correctly (such as those in Microsoft Developer Studio project files) when using the scrollbar thumb/scroller. [I12443]
  • It is now possible to view previous revisions of deleted files in a Subversion repository using the Subversion plugin. [I12627]
  • The filename entry field on file comparisons no longer flickers under VMware Fusion after each character is typed. [I12698]
  • The two A double-click on a folder row: fields on the Launch Behaviour options page now have correct indentation and capitalization. [I12704]
  • Synchronization links are now reset appropriately when swapping first and third files in a file comparison. [I12706]
  • The mouse is no longer inappropriately captured (resulting in unwanted selections) when a click in an inactive Merge file panel causes a message box to appear. [I12818]
  • An error message is now shown when an attempt is made to use the Perforce plugin to access a file that does not exist. [I12857]
  • In a binary comparison, after swapping an empty panel with a panel showing file content, the error message about failing to open a file is now shown in the correct (empty) panel. [I12868]
  • The Launch Behaviour topic has been corrected to remove a reference to an option that no longer exists. [I12209]
  • The FolderComparisonReportDifferences.cs Automation API sample script is no longer double-spaced. [I12391]
  • Commands in the ribbon should now always be updated correctly when Merge first opens. [I12413]
  • Merge now correctly copies timestamps when transferring files from a remote FTP server. [I12449]
  • Print previews of binary comparisons now work. [I12899]
  • The links to the WinCvs website in the SCM integration instructions have been updated. [I12213]
  • The ConfigLong Enumeration topic has been updated to include the numbers associated with the clShowUnchanged constant. [I12365]
  • A localizable string used in HTML reports has been moved to MgReportLocalized.xslt from MgFileRowData.xslt. This should not affect functionality. [I12265]
  • Other changes:
  • Merge no longer includes French, German and Spanish localizations. Full Japanese and English localizations continue to be provided. Customers desiring to use a French, German or Spanish localized version of Merge can continue to use the Merge 2010.3947 release. [I12495]

New in Araxis Merge 2010.3947 (Nov 11, 2010)

  • Enhancements:
  • New French, German and Spanish UI localizations. The online help is available in English and, in the Japanese localization of Merge, Japanese. [I11981]
  • Custom syntax highlighting can now be defined for types of files not already recognized by Merge (Options… > Text Comparisons > Syntax Highlighting > Edit Generic…). [I11712, I11968]
  • The text extraction filter for Microsoft Excel spreadsheets is vastly improved. In particular, numeric cells should now have the correct number formatting applied to them. [I11851, I12016, I11926]
  • The PDF filter can now extract text from most Japanese-language PDFs. Other formerly problematic PDFs (such as those created by Documaker) are also much more likely to work. [I10480, I11246]
  • Instructions are now provided for integrating Merge with the Subversive plugin for Eclipse. [I12051]
  • The instructions for integrating Merge with Git have been rewritten to include a new, simpler method of configuring Merge as the external comparison and merging tool. [I11943]
  • The Git, Mercurial, Subversion and TortoiseHg integration instructions have been updated and/or corrected. [I11782, I11702, I11720, I12017, I12042]
  • Instead of the (easily-missed) system tray notification icon, Merge for Windows now notifies users of important messages using a popup notification window, in a similar way to Merge for Mac OS X. [I11980, I12056]
  • The serial number support expiry notification will now appear briefly whenever the application starts, until it is expressly dismissed. Previously, it appeared only once every 30 days and was therefore easy to miss. [I12060]
  • The filename of the temporary input file that is passed to an external filter program now has the same extension as the original file. This makes it easier for external filter programs to change their behaviour based on the extension of the file Merge is comparing. [I11694]
  • An option has been added for Merge to not heed #pragma code_page directives in compared text files. [I11787]
  • The Excel text filter is now able to extract text from Excel 97 files created by Vignet. [I11833]
  • The Merge for Windows application and document icons have been updated to the new Araxis product family style. [I11881]
  • A new FAQ item has been added describing various ways to speed up folder comparisons. [I11842]
  • The Java Runtime Environment (JRE) included with Merge has been updated to a more recent version. [I12019]
  • Various minor improvements have been made to the online help. [I11828, I11998, I12067, I11655]
  • Bugs fixed:
  • In a three-way folder comparison automatic merge operation, Merge now deletes the common ancestor file if there are no changes in 1st and 2nd files and the 3rd file has been deleted. [I11704]
  • In a three-way folder comparison automatic merge operation, a folder comparison conflict is now flagged when a file in the middle panel is not present in one of the other panels and is changed in the other. [I11958]
  • The html2TextFilter file filter is now able to extract text from XHTML documents. [I11832]
  • The Select rows > Selected changed command (Edit > Select Changed Rows in the old-style user interface) no longer selects inserted and removed rows. [I11960]
  • A warning message is now displayed in formatted XML files where whitespace at the end of lines has been ignored. [I11960]
  • The C# and other Automation API samples included with Merge have been retested and a variety of problems addressed. [I12100, I12101]
  • Outdated references to the FileComparison object in the Automation API documentation have been corrected to refer to the TextComparison object. [I12084]
  • Merge should no longer give a ‘Unable to cast COM object of type…’ error with .NET client applications using the Automation API. [I12125]
  • The documentation and the ribbon tooltip now agree concerning the keyboard shortcut for Hide Empty Folders menu item in the old-style user interface. [I12063]
  • When launching a three-way comparison managed by Microsoft Team Foundation Server 2010 from Visual Studio 2010, it is now possible re-compare the files as a different type (text, binary, image). [I12114]

New in Araxis Merge 2010.3837 (Nov 11, 2010)

  • Enhancements:
  • The user interface and online-help have been fully-localized into Japanese. [I11670]
  • The timestamp on HTML reports is now shown in the local timezone, not UTC. [I11673]
  • Bugs fixed:
  • A redundant Comparison statistics button has been removed from the old-style toolbar user interface. [I11622]

New in Araxis Merge 2010.3829 (Nov 11, 2010)

  • Enhancements:
  • New UI on modern versions of Windows. On Windows 7, and Windows Vista with the Platform Update installed, Merge now uses the native Windows Ribbon user interface pioneered by Microsoft Office 2007 and adopted by Windows 7. The ribbon generally makes it easier to discover and use Merge features than the old-style traditional menus and toolbars. For essential further information, please see The Ribbon and the Toolbar: Making the Most of the Merge User Interface on Different Versions of Windows. [I11230, I11354, I11356, I11359, I11372, I11412, I11445, I11473, I11519, I11540, I11204, I11362, I11477, I11371, I11353, I11241, I11352]
  • Enhanced UI on older versions of Windows. On older versions of Windows, Merge continues to provide the traditional menu and toolbar user interface. The menus and toolbars have been reworked and improved. There are now just two toolbars (rather than the previous three), and more actions are directly available from them than before. The toolbar icons have been re-drawn in a more modern style to bring them into line with the new Ribbon user interface. As well as making Merge easier to use, these changes collectively make the transition from the old-style toolbar UI to the new-style Windows Ribbon interface less severe. [I11204, I11358, I11559, I11038, I11545, I11546, I11390, I11147, I8615]
  • Streamlined setup packages. The Merge setup packages have been streamlined to avoid confusion and drop those that are no longer necessary or relevant. Only the Microsoft Software Installer .msi setup packages are now distributed. Installation instructions have been revised accordingly. [I11508]
  • New installations of Merge for Windows and Mac OS X now use similar highlight colours by default. [I11465]
  • Various incidental icons and other artwork used by Merge have been re-drawn. [I11478, I11495]
  • Merge now has the ability to save a workspace consisting of multiple open file comparisons to a single file. [I10335]
  • More information is now passed to external file filter programs. For more information, see Edit File Type. [I11164]
  • Merge now passes the original filename to a third-party filter program when the file is on the local filesystem. [I10917]
  • The Java Runtime Environment that comes with Merge (used by Merge file filters) has been updated to avoid a benign warning given by certain third-party security screening tools. [I11175]
  • An FAQ item about .pptx files has been added. [I11023]
  • An FAQ item describing the limitations of the text extraction filters for Excel files has been written. [I11099]
  • Following customer feedback, the Ctrl+Tab and Ctrl+Shift+Tab keyboard shortcuts that cycle between tabs have been reinstated. [I11077]
  • The hint in the file history menus (that Ctrl may be held down to fill in fields on other panes) now appears for longer on new installations of Merge. [I11493]
  • The Merge major version has been updated to 2010, and copyright dates extended accordingly. [I11526]
  • The seldom-used (or noticed) context help for dialog controls has been removed. The relevant information is still provided in the help topic for each dialog page. [I11564]
  • It is no longer be possible to hide the status bar, tab panel or merging buttons. These legacy options were no longer relevant for current Merge usage. [I11505]
  • It is now possible for Merge to be instructed to ignore corrupted locales on a customer’s machine. [I11389]
  • Bugs fixed:
  • The folder comparison command File > Print Selection now works again. [I11189]
  • In the old-style toolbar UI, the Window menu now has horizontal comparison layout items when an image comparison is selected. [I11199]
  • The default width for the three-way folder comparison window Changes column header is now more appropriate on Windows 7. [I11203]
  • Double clicking on a row in a folder comparison the second or subsequent time now returns you to the file comparison tab already open for that row. [I11218]
  • The text extraction filters have been modified to head-off a potential problem. [I11399]
  • Merge no longer has a double border above the status bar on Windows 7. [I11425]
  • A problem whereby a single synchronization link could gain three (or more) heads has been resolved. [I11449]
  • Merge will no longer freeze when right-clicking on a file called by a particular customer’s custom filter program that performed its own DDE conversation. [I10921]
  • The Automation API Print method now respects the clPrintToFile preference when asked to print without a print dialog being shown to the user. [I11539]
  • The Merge icon is now displayed in the Uninstall or change a program section of the control panel on Windows 7. [I11558]
  • An outdated external link in the Regular Expression Reference has been fixed. [I11170]
  • A benign error regarding OpenMP, logged in the system Event log, has been resolved. [I11583]
  • The Ctrl+Q keyboard shortcut now works. [I11213]
  • A potential crash/assertion can no longer occur when a comparison that has been opened with the Automation API closes. [I11404]
  • When running an evaluation version of Merge, the evaluation dialog will now appear even if Merge is launched from the command-line, Windows Explorer, or via the Automation API. [I11171]
  • The evaluation dialog for evaluation versions of Merge now appears on top of the main window upon application launch, not behind it. [I11159]
  • Merging inserted or removed lines at the bottom of a file is now possible using keyboard shortcuts. [I11098]
  • It is no longer possible for a two-way folder comparison with panel titles, started via the Automation API, to lose the third title when it is switched to three-way mode. [I11557]
  • A broken link within the ClearCase SCM integration instructions has been removed. [I11320]
  • A mark in the overview strip for the left file will now be shown for a deletion at the very end of that file. [I11060]
  • There should now be consistency within the Merge documentation with regard to the hyphenation of ‘command-line’. [I11463]
  • The support expiry reminder in the notification area of the Windows task bar now only appears every thirty days. [I11578

New in Araxis Merge 2009.3713 (May 19, 2009)

  • The keyboard shortcuts topic has been amended to reflect the removal of the Ctrl+Tab and Ctrl+Shift+Tab shortcuts. These shortcuts were replaced by standard Windows alternatives in an earlier release.
  • Merge no longer opens a new text comparison on start-up if the option to do so is unchecked.
  • Merge will now correctly show all merging buttons when a regular expression is enabled that forces lines into the unchanged state and the option to break changes into individual lines is enabled.
  • Merge will no longer crash when performing a merging operation on certain files when a regular expression is enabled that forces lines into the unchanged state and the option to break changes into individual lines is enabled.

New in Araxis Merge 2009.3705 (May 5, 2009)

  • EnhancementsA wealth of Automation API programming examples is now provided with Merge, located in the AutomationSamples directory within the Merge installation directory. Many of the examples perform valuable tasks; others will give you ideas for how you could use Merge to provide solutions for your own environment. For more information, see Getting Started with the Automation API. [I8714, I10850, I10851, I10684]
  • Integration with the Git version control system is now supported via two supplied additional command-line utilitles, araxisgitdiff and araxisgitmerge. For integration instructions, see Integrating with Source Control, Configuration Management and Other Applications. [I10774, I10795, I10988, I10989]
  • Instructions for integrating Merge with the Mercurial version control system are now provided on the Integrating with Source Control, Configuration Management and Other Applications page. [I10776, I10993]
  • Instructions for integrating Merge with TortoiseHg front-end to Mercurial are now provided on the Integrating with Source Control, Configuration Management and Other Applications page. [I10949]
  • Instructions for integrating Merge with SourceGear Vault version control system are now provided on the Integrating with Source Control, Configuration Management and Other Applications page. [I8667]
  • Information on integrating with Seapine Surround SCM are now provided on the Integrating with Source Control, Configuration Management and Other Applications page. [I10144]
  • Instructions for integrating Merge with AccuRev are now provided on the Integrating with Source Control, Configuration Management and Other Applications page. [I10598]
  • The Automation API documentation now provides the numeric values for symbolic enumeration constants wherever they are relevant. [I10933]
  • The documentation for the NumberOfChanges method on the ImageComparison object now explains what is being counted. [I10934]
  • An FAQ item on how to speed up comparisons of large files has been added. [I10860]
  • The Comparing Text Files (or Typed/Pasted Text) topic has been updated to mention support for the syntax highlighting of Visual Dataflex files. [I10763]
  • It is now possible to specify explicitly a character encoding to use when comparing files with the Automation API. See the CompareAsyncWithEncoding and CompareWithEncoding methods on the TextComparison Object page. [I10910]
  • The way that Merge handles multiple windows in tabs has been improved. [I10780, I10790, I10848, I10849, I10887, I10899]
  • The Folder Comparisons in the Options dialog has a new option, Gather line count statistics for inserted and removed files. Unchecking this option can significantly speed-up folder comparisons, at the expense of losing line count statistics for inserted and removed files. [I10900, I10906]
  • The major version number of Merge has been changed to 2009, to reflect the year of release. [I10711, I10866]
  • Various minor improvements to the online help have been made. [I10459, I10545, I10654, I10680, I10745, I10801, I10836, I10935, I10969, I10953]
  • The Japanese-language help has been brought up to date. [I10928]
  • This release of Merge has been tested on the Windows 7 beta. Please report any problems you encounter when using Merge on pre-release versions of Windows 7. [I10779]
  • When double-clicking a word to highlight it, Merge will now include numbers in the set of characters that it considers to make up an individual word. This means, for example, that you can double-click to select a variable with a name such as ‘m_fAutoCMD12Success’. Previously, Merge would have selected only ‘m_fAutoCMD’ portion of the name. [I9188]
  • Bugs fixedA ‘side-by-side configuration incorrect’ error that occurred when Merge was launched in certain circumstances has been fixed. [I10886]
  • A crash when performing a folder comparison Merge to Common Ancestor action has been fixed. [I10898]
  • A potential cause of premature support expiry has been eliminated. [I10865]
  • Bookmarks in a folder comparison that contain carriage return characters now display correctly when Merge is runnding under VMWare. [I10916]
  • The overview strip is now correctly placed when launching Merge from compare.exe. [I10508]
  • In a folder comparison, Merge no longer inappropriately copies the contents of excluded folders. [I10384]
  • Merge now displays a friendly error message if a user tries to save a file in an unsupported format, such as a Microsoft Office document. [I10630]
  • A work-around for the merging buttons not always reverting back to their double-arrow state under VMWare has been fixed. [I10913]

New in Araxis Merge 2008.3626 (Mar 24, 2009)

  • This was a production-quality release of Merge 2007. All users are encouraged to upgrade to Merge 2008 (which will be free for customers whose support/updates entitlement is still current), but downloads for this version are made available here as a convenience for customers who do not yet wish to move.
  • Bugs fixedThe End page field in the print dialog now works. Previously, Merge would would print through to the last page, regardless of this setting. [I9672]

New in Araxis Merge 6.5 Build 2300 (Sep 2, 2006)

  • In a folder comparison, it is now possible to filter files and folders based on their location in the folder hierarchies. A filter pattern that contains a path separator character will be matched against the fully-qualified path to the file or folder bein
  • Each file panel in a text comparison window has its own memory of the last folder that was browsed by its Open File... dialog
  • The FileComparison Automation API object has a new property called AutoSaveOnClose. When set to True, modified files are automatically saved when a file comparison is closed. The prompt to save modified files will not then appear. This feature can sometim
  • Cyrillic filenames differing only in character-case will now be placed on the same results row
  • The Run... command in folder comparison context menus will no longer disappear when multiple files are chosen from several different sub-folders