English | 日本語
Home > Merge > Merge for OS X > Download Merge for OS X > Release History

History of Merge for OS X Releases and Older Downloads

Need to download an older version of Merge not available below? Please contact us.

Merge 2013 releases

Merge 2013.4283 (14 January 2013)

This release features a number of minor enhancements and fixes. It is the current production quality release and is recommended for all users.

System requirements

This release has been tested on the following platforms:

  • OS X v10.8.2 Mountain Lion
  • OS X v10.7.4 Lion
  • OS X v10.6.8 Snow Leopard (32-bit and 64-bit)

Merge is no longer supported on OS X v10.5 Leopard. Customers may continue to use an older version of Merge (2012.4246 or earlier) that works with that platform.

Downloads

Enhancements

  • The various Merge command-line utilities have been moved into the application bundle to simplify installation. If you use the command-line utilities, you may need to update your shell’s PATH environment variable accordingly. For more information, please see Installing from the Araxis Website. [I13534]
  • Various minor improvements have been made to the online help. [I13347, I13396]
  • The Application Options preference tab has been renamed to Application.
  • The Merge major version has been updated to 2013 to reflect the year of release. [I13535]

Defects fixed

  • An occasional crash when closing a text or binary file comparison has been fixed. [I13516]

Merge 2012 releases

Merge 2012.4269 (26 November 2012)

This release featured a number of minor enhancements and fixes. All users (except those still on Leopard) are encouraged to upgrade to the most recent version.

System requirements

This release has been tested on the following platforms:

  • OS X v10.8.2 Mountain Lion
  • OS X v10.7.4 Lion
  • OS X v10.6.8 Snow Leopard (32-bit and 64-bit)

As of this release, Merge is no longer supported on OS X v10.5 Leopard. Customers may, of course, continue to use an older version of Merge (2012.4246 or earlier) that works with that platform.

Downloads

Enhancements

  • The OS X v10.7 variant of Merge is digitally signed to accommodate the introduction of Gatekeeper in OS X v10.7.5. [I13414]
  • The application icon artwork has been updated for Retina displays. The application itself continues its full support of Retina display resolutions. [I13405]
  • Instructions for integrating with the Cornerstone client for Subversion have been added to the Integrating with Source Control, Configuration Management and Other Applications page. [I12374]
  • Tabs and toolbar buttons have been adjusted to fit better with the Mountain Lion and Lion user interface style. [I13451]

Defects fixed

  • On Mountain Lion, the araxisgitdiff and araxisopendiff command-line utilities work properly with relative paths. [I13415, I13435]
  • On Mountain Lion, the keyboard shortcuts shown on application menus show the correct shortcuts, instead of ‘fn’.
  • Merge is able to create a folder hierarchy when copying files from one pane to another in a folder comparison where the destination location has ancestor folders that are read-only. [I13421]

Merge 2012.4246 (13 September 2012)

This release brought full support for OS X Mountain Lion. (It also continued to support the new Mac Book Pro with Retina display.) This was the last release to support OS X v10.5 Leopard. All users (except those still on Leopard) are encouraged to upgrade to the most recent version.

System requirements

This release has been tested on the following platforms:

  • OS X v10.8.1 Mountain Lion
  • OS X v10.7.4 Lion
  • OS X v10.6.8 Snow Leopard (32-bit and 64-bit)

The following platforms are also expected to work and supported with a separate setup disk image, but are no longer subject to routine release testing:

  • OS X v10.5.8 Leopard (32-bit and 64-bit, PowerPC and Intel Universal binary)

Merge is no longer supported on OS X v10.4 Tiger. Customers may, of course, continue to use an older version of Merge (2009.3793 or earlier) that works with that platform.

Downloads

Enhancements

  • Merge is fully tested and supported on OS X Mountain Lion. A download is provided specifically for Mountain Lion. [I13370, I13380, I13383]
  • The OS X v10.8 variant of Merge is digitally signed, meaning that it can be opened on Mountain Lion regardless of the Gatekeeper System Preferences > Security & Privacy > General > Allow applications downloaded from setting. [I13286]
  • Serial numbers with support expiry dates after 2017 are now supported. [I13302]

Defects fixed

  • A crash caused by swapping the first and second folders in a folder comparison and then immediately viewing a context menu no longer occurs. [I13389]

Merge 2012.4201 (31 May 2012)

This release featured several minor enhancements and fixes. All users are encouraged to upgrade to the most recent version.

Downloads

Enhancements

  • When using the araxissvndiff utility (e.g. as a result of running svn diff -c <n>), Merge now endeavours to infer the type of a file from the supplied panel title text. This should enable syntax highlighting to work in some cases. Note that this is a rather fragile workaround to the underlying problem that Subversion creates temporary filenames without extensions, making it extremely difficult for other applications to infer the file type reliably. [I13192]
  • 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. [I13197]
  • Instructions for integrating Merge with the Tower client for Git are now provided on the Integrating with Source Control, Configuration Management and Other Applications page. [I13169]
  • Memory handling has been optimized even further. This should help with performance, especially with large comparisons. [I13226]

Defects fixed

  • On OS X Lion, when editing by dragging and dropping text, the text is now shown the right way up as it is being dragged. [I13219]
  • Adding comments to a file in a binary comparison no longer causes Merge to indicate that the file has been edited. [I13266]
  • If the option to not show line numbers in text comparisons has been selected then line numbers no longer appear in HTML reports. [I13153]
  • The sample text in the Font/Colours preference tabs for folder and file comparisons is now centred. [I13185]
  • Non-functional controls for setting the fonts of a folder comparison have been removed from the preferences. [I13184]
  • The correct fonts should now be used in XML and HTML three-way file comparison reports. [I13151]

Merge 2012.4169 (22 February 2012)

This release featured direct access to Git and Mercurial repositories, along with several other enhancements and fixes. All users are encouraged to upgrade to the most recent version.

As of the Merge 2011.4040 release, Araxis is focusing its testing efforts primarily on OS X Lion and Snow Leopard. Merge continues to be supported on OS X Leopard via a separate setup disk image, but that platform is no longer subject to routine release testing.

Downloads

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. [I10840, I12824]
  • The Use filter program in folder comparisons option has been moved to the Folder Comparisons preference tab. [I11876]
  • The folder comparison option Gather line count statistics for inserted and removed files is off by default. [I11873]
  • The major version number has been updated to 2012, reflecting the year of release. [I13041]

Defects fixed

  • An intermittent crash on OS X Lion no longer occurs. [I13128]
  • Content no longer appears more than once in the centre panel of a three-way binary file comparison. [I13083]
  • Merge no longer fails to copy files over a network where one of the folders is encrypted. [I13117]
  • Various minor corrections and improvements have been made to the documentation. [I12965, I12990, I13053, I13115]

Merge 2011 releases

Merge 2011.4126 (8 November 2011)

This release provided support for OS X Lion fullscreen mode and brings the Japanese localization up-to-date with the English. Various other minor enhancements and fixes were also incorporated. All users are encouraged to upgrade to the most recent version.

As of the Merge 2011.4040 release, Araxis is focusing its testing efforts primarily on OS X Lion and Snow Leopard. Merge continues to be supported on OS X Leopard via a separate setup disk image, but that platform is no longer subject to routine release testing.

Downloads

Enhancements

  • OS X Lion fullscreen mode is now supported. [I12721]
  • The Japanese user interface and help localization has been brought up to date. [I12973]
  • The Preferences window features redrawn icons that are more in keeping with OS X Lion than the old ones. [I12730]
  • The Merge distribution disk image filenames have been renamed and a new disk image for OS X Lion introduced. For details, see Installing from the Araxis Website. [I12873]
  • Instructions for integrating Merge and SourceTree are now provided. [I12833]
  • The instructions for integrating Merge and MacHg have been updated. [I12911]
  • Merge now comes to the front when right-clicking on its dock icon to open a new comparison. [I12944]

Defects fixed

  • The instructions for integrating Merge and AccuRev have been corrected. [I12810]
  • Various minor corrections to the online help have been made. [I12896, I12839, I12831]
  • The previous change button now works correctly in binary comparisons. [I12679]
  • Comparison statistics are now correct for three-way text comparisons with typed text. [I12724]
  • Opening a file comparison using the compare command-line utility now never results in an extra empty tab being opened. [I12739]
  • References to preferences in the folder comparison statistics window text are now appropriate for Merge for OS X. [I12842, I12843]
  • Saved three-way file comparisons no longer sometimes open as two-way comparisons. [I12942]

Merge 2011.4040 (27 June 2011)

This release included further updates to track changes in the OS X Lion developer previews, along with several other enhancements and fixes. All users are encouraged to upgrade to the most recent version.

As of this release, Araxis is focusing its testing efforts primarily on OS X Lion and Snow Leopard. Merge continues to be supported on OS X Leopard via a separate setup disk image, but that platform is no longer subject to routine release testing.

Changes for OS X Lion

  • Merge should now be fully operational on OS X Lion Developer Preview 4 + update. Several issues that arose since Lion Developer Preview 3 have been addressed.
  • Merge now provides a more helpful explanation when an attempt is made to use a file filter on Lion and the Java runtime is not present. [I12614]
  • Merge no longer crashes on OS X Lion when quitting in certain circumstances. [I12620]
  • Merge now opens an empty comparison window upon startup on Lion DP4 + update. [I12692]
  • Scrollbars and scrolling now appear and work correctly on Lion DP 4 + update. [I12667, I12709]
  • In-panel information and warning messages are no longer corrupted when bounce-scrolling past scroll-endstops on Lion DP4 + update. [I12723]
  • Help topics have been updated to reference Lion as appropriate. [I12738]

Other enhancements

  • The instructions for integrating Merge with Mercurial have been improved, and instructions for integrating with MacHg added. [I12087, I12661]
  • The Perforce and Subversion tabs under Application Options in the Preferences window have been combined into a single SCM tab. [I12669, I12733]
  • The internal management of windows has been reworked to improve maintainability. This should not have caused any user-visible changes. [I12635]

Other bugs fixed

  • All the sample AppleScript scripts provided with Merge are now working again. [I12740]
  • Merge no longer crashes when using File > Save File As. [I12633]
  • It is now possible to view previous revisions of a deleted file in a Subversion repository using the Subversion plugin. [I12628]
  • The Subversion plugin now works with Subversion repositories configured to support anonymous access. The svnfile: protocol is also now working again. [I12629]
  • Missing bindings in the Japanese localization of the Preferences window have been restored. [I12599]
  • Synchronisation links are now removed when swapping panels in a text comparison. [I12674]
  • A spurious tooltip on a page in the Preferences window has been removed. [I12675]
  • Several inappropriately enabled menu items are now disabled for image and binary comparisons. [I12680]
  • The disclosure triangles to the left of folders in a folder comparison no longer disappear when the column headers are used to sort. [I12682]

Merge 2011.4026 (12 May 2011)

This release introduced preliminary support for OS X Lion, significantly enhanced access to certain SCM systems, along with many other enhancements and fixes. All users are encouraged to upgrade to the most recent version.

Enhancements

  • Preliminary support for OS X Lion has been added. This has been tested with OS X Lion Developer Preview 2. One or two rough edges remain, but Merge should be fully functional. Please report any problems you encounter with Merge on Lion. [I12590, I12497]
  • The Versions button can now make available other versions of a file or folder stored in Perforce or Subversion repositories, as well as those stored by Time Machine. See the updated Comparing Text Files (or Typed/Pasted Text) topic for further details. [I12278, I12298, I12300, I12301, I12277, I12352, I12360, I12398, I12401, I12404, I12407, I12409, I12419, I12421, I12469, I12474, I12488, I12490, I12493, I12494, I12521, I12523, I12524, I12525, I12526, I12527, I12532, I12534, I12539]
  • Merge now has a single preference page for storing all credentials for accessing SCM systems. This replaces the ad-hoc dialogs that used to pop-up when Merge needed login information. [I12388]
  • The documentation for integrating Merge with Git, Subclipse, Subversion and svnX has been improved. Instructions for integrating with Subversive have been added. [I12162, I11416, I12075, I12018, I12041, I12050]
  • In a folder comparison, the Select All menu item will now expand and select the contents of all collapsed subfolders. [I11972]
  • The documentation relating to accessing other versions of a file from Time Machine backups has been improved. [I12408, I12370]
  • The command-line comparison utilities now endeavour to bring Merge to the foreground after launching the comparison. [I12099]
  • The Filename Patterns on the File Types preference page now allows a literal filename with no wildcard to be specified. [I12369]
  • The Merge notification messages that appear in the bottom-left corner of the screen now remain visible for slightly longer, making them easier to read. [I12055]
  • The major version number has been changed to 2011, to match the year of release. [I12340]
  • The support expiry notification message will now continue to appear until it is expressly dismissed. Previously, it would appear only once every 30 days and was therefore very easy to overlook. [I12061]
  • Merge now specifies both CFBundleVersion and CFBundleShortVersionString in its application bundle Info.plist file. This should improve compatibility with certain third-party software update managers (e.g. MacUpdate). [I12350]
  • The redundant EULA.rtf file has been removed from the contents of the Merge distribution disk image. [I12171]
  • The trademarks and information about the Boost library on the Legal Notices page have been updated. [I12295, I12302]

Defects fixed

  • When performing an automatic folder merge and a file does not exist in the common ancestor folder, Merge will now use the same character encoding as the existing file for the newly created merged file. [I12238]
  • When the File timestamps and sizes only folder comparison preference is checked, the Compare byte-by-byte for files larger than… preference is now properly greyed-out and inactive. [I12059]
  • A crash that occurred when comparing specific files in a three-way binary comparison has been fixed. [I12603]
  • Merge no longer crashes when loading an HTML file with a mis-declared invalid character encoding. [I12506]
  • A typographical error in the Regular Expression Reference topic has been corrected. [I12165]
  • On the Notifications preference page, the check boxes are now left-aligned with the Show notifications about label above them. [I12010]
  • The ‘unchanged lines omitted’ string in HTML reports has been moved to its correct location, and so should appear correctly localized in future Merge releases. [I12266]
  • The Comparing Text Files (or Typed/Pasted Text) article has been updated to properly reflect the capabilities of the file filters updated in the previous release of Merge. [I12014, I12015]
  • An error in one of the documentation examples for launching Merge from the command-line using the compare command has been corrected. [I12377]

Merge 2010 releases

Merge 2010.3907 (21 July 2010)

This was a previous production-quality release of Merge 2010 for OS X. All users are encouraged to upgrade to the most recent version.

Enhancements

  • Custom syntax highlighting can now be defined for types of files not already recognized by Merge (Preferences… > Text Comparisons > Syntax Highlighting > Generic…). [I11713, I11835, I11836, I11837, I11839, I11845, I11969, I11978]
  • 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. [I11850, I11923]
  • The PDF filter can now extract text from most Japanese-language PDFs. [I11854]
  • A version of Merge optimized for OS X v10.6 is now provided. A separate download for OS X v10.5 continues to be provided. OS X v10.4 Tiger is no longer supported by new versions of Merge (although customers may still, of course, continue to use prior releases). [I11305, I11763, I11858]
  • Folder comparisons should now use less memory. In addition, performing a very large folder comparison for a second time now uses vastly less RAM and will be significantly faster. [I11820, I11821]
  • It is now possible to disable certain notification messages (Preferences… > Application Options > Notifications). [I11397]
  • The tabbed user interface is now the default. [I11075]
  • When in tabbed mode, the document icon on tabs now changes into a close button when the pointer is over any part of the tab. Previously, the pointer had to be directly over the icon itself before it would change. [I11219]
  • Fresh installations of Merge for Windows and OS X now use similar change highlighting colours by default. [I11467]
  • Any pre-existing folder comparison results are now cleared when a new comparison is initiated, helping to avoid confusion. [I11819]
  • A item has been added to the FAQ describing how to speed up folder comparisons. [I11841]
  • There is a new command-line comparison utility, compare2, which behaves like compare with a -swap argument. [I11551]
  • The filename of the temporary input file that is passed to external file filter programs now has the same extension as the original file. This enables external filters to determine the type of a file based upon its extension. [I11695]
  • The instructions for integrating Merge with Git have been rewritten to include a new, simpler method of configuring Merge as the external tool comparison and merging tool. [I11890]
  • The Merge major version has been updated to 2010, and copyright dates extended accordingly. [I11534]
  • Merge has a new application icon drawn in the new Araxis product family style. [I11882, I11904, I11994]
  • Various minor improvements have been made to the online help. [I11462, I11577, I11462, I11834, I11997, I11298]

Defects fixed

  • In a 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. [I11709]
  • In a 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. [I11957]
  • A yellow background is no longer given to markers in folder comparisons when hovering over them to see their details. This problem only occurred under Snow Leopard. [I11299]
  • Changes to preferences should now be saved under Snow Leopard even when Merge is asked to close suddenly (for example, during a machine shutdown). [I11405]
  • A problem whereby a single synchronization link could gain three (or more) heads has been resolved. [I11512]
  • The html2TextFilter file filter is now able to extract text from XHTML documents. [I11831]
  • A keyboard shortcut has been added for the Discard Unsaved Changes button in the Save Modified Files sheet. [I11420]
  • The View > Comparison Statistics menu item is no longer erroneously enabled for image comparisons. [I11621]
  • The File > Report… menu item is no longer inadvertently enabled for image and binary comparisons. [I11727]
  • A warning message is now displayed in formatted XML files where whitespace at the end of lines has been ignored. [I11697, I11947]
  • The Mercurial integration instructions have been corrected. [I11781]
  • The PDF text extraction filter no longer removes all double letters from certain Apple PDF documents. [I11826]
  • Folder comparisons no longer try to follow drive links or read character devices (hard drive images in /dev). This enables them to be performed upon volumes containing Time Machine backups. [I11844]
  • The file patterns *.inc and *.dtd now appear only once in the Syntax Highlighting preference page. [I11846]
  • In a three-way folder comparison the Edit > Select Changed Rows menu item no longer selects inserted and removed rows. [I11959]
  • It is now always be possible to change font preferences for text comparisons. [I11995]

Merge 2009 releases

Merge 2009.3793 (12 October 2009)

This was a previous production-quality release of Merge 2009 for OS X (and the last to support OS X v10.4 Tiger). All users not still using Tiger are encouraged to upgrade to the most recent version.

Enhancements

  • Merge is now fully compatible with OS X v10.6 Snow Leopard. [I11260, I11223]
  • Support for Finder integration on 64-bit Macs running OS X v10.6 Snow Leopard has been added via the system-supplied Services menu. This is explained further in the new topic, Integration with Finder. [I11172, I11292, I11300]
  • When Merge is configured to use tabs within a single top-level window, there is now a drop-down menu in the tab strip that can be used to select any of the open tabs. [I11088]
  • For folder comparisons, a sub-menu has been added to the drop-down menu on the Preferences toolbar button for selecting different filters. [I11142]
  • The performance of find and replace operations within a text comparison has been improved in certain circumstances. [I11261]
  • Additional information is now passed to external file filter programs. For more information, see the File Types topic. [I11165]
  • The command-line compare utility is now able to compare files located directly within a Subversion repository. [I11205]
  • The Frequently Asked Questions list has been updated with information concerning the limitations of the text extraction filters for Microsoft Excel files. [I11100]

Defects fixed

  • An encoding problem that caused problems for the comparison statistics when running under OS X v10.6 Snow Leopard has been fixed. [I11242]
  • Image files are now displayed correctly when scrolling under OS X v10.6 Snow Leopard. [I11311]
  • Screen corruption in certain very specific circumstances following a merging operation no longer occurs. [I11272]
  • Choosing to display only text on the toolbar now works immediately on OS X v10.4 Tiger. [I11308]
  • Linking lines now display correctly when scrolling and the Use smooth scrolling system preference is set. [I11310, I10677]
  • Clicking the Save or Save As... segmented buttons in the Save Modified Files sheet now acts on the correct table row, rather than the last selected row. [I11277]
  • Icons on the merging buttons within a text comparison should now always be crisp. Previously, they could be slightly blurry in some situations. [I11245]
  • The instructions on the Integrating with Source Control, Configuration Management and Other Applications page for integrating with the Git version control system This link is to an external websitehave been corrected. [I11184]
  • The formatting on the Japanese translation of the Integrating with Source Control, Configuration Management and Other Applications page has been corrected. [I11186]
  • An error in the Command-Line Reference help topic has been corrected. [I11078]
  • A broken link in the Regular Expression Reference help page has been fixed. [I11173]
  • Various typographical errors in the help have been corrected. [I11105]

Merge 2009.3725 (24 June 2009)

This was a previous production-quality release of Merge 2009 for OS X. All users are encouraged to upgrade to the most recent version.

Defects fixed

  • Various aspects of the Japanese-localized version of the user interface have been corrected.

Merge 2009.3721 (1 June 2009)

This was a previous production-quality release of Merge 2009 for OS X. All users are encouraged to upgrade to the most recent version.

Defects fixed

  • The Open new comparisons in a tabbed window preference now works correctly on the Japanese-localized version of the user interface.

Merge 2009.3719 (28 May 2009)

This was a previous production-quality release of Merge 2009 for OS X. All users are encouraged to upgrade to the most recent version.

Enhancements

Defects fixed

  • When using Save As to change an XML file from DOS to OS X line endings, the line endings will now be applied as in the original file, not as in the XML file reformatted for display. [I10594]
  • Merge now uses the shared Find pasteboard for search text. [I10765]
  • In folder comparisons, the icon adornment for new files is now only present when the file is in more than one column of the comparison. [I10806]
  • Overview strips are now visible upon initial load for all files opened from the command-line. [I11008]
  • The compare command-line utility now allows saving to a merged output file regardless of file permissions of the input files. [I10936]
  • The compare command-line utility -wait argument now returns correctly if Merge is quit (rather than the comparison in question merely being closed). [I10994]
  • Resolved markers will now always be displayed the right way up. [I11050]
  • When opening files, the There is no file loaded message text is no longer displayed prematurely. [I10792]
  • A problem reported by one user whereby the Merge Finder plugin prevented shutdown has been fixed. [I10844]
  • A problem with releasing a drained NSAutoreleasePool (manifested as an error message in the log on Snow Leopard) has been fixed. [I10967]
  • 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. [I11026]
  • A problem has been fixed whereby support would prematurely expire if the Araxis Merge application bundle were altered by disk-space reduction applications. [I10863]

Merge 2009.3646 (12 January 2009)

This was a previous production-quality release of Merge 2009 for OS X. All users are encouraged to upgrade to the most recent version.

Enhancements

  • The major product version number is now 2009, to reflect the year of release. [I10710]
  • Instructions for using Merge to access FTP sites have been added to the Frequently Asked Questions. [I10493]
  • Much of the information on the Merge overview page is now initially collapsed. [I10675]

Defects fixed

  • The 64-bit PowerPC version of Merge no longer allows certain invalid serial numbers. [I10619]
  • An encoding problem that occurred in certain circumstances with comparisons involving UTF-16 files has been corrected. [I10659]

Merge 2008 releases

Merge 2008.3633 (11 November 2008)

This was a previous production-quality release of Merge 2008 for OS X. All users are encouraged to upgrade to the most recent version.

Major changes

  • The Merge user interface and online help have been translated into Japanese. This means that Merge for OS X now fully accommodates both English and Japanese-language users. [I10595]

Other enhancements

  • Merge will now delete Araxis Ketura comparison files after it has opened them. This enhances the integration between Ketura, Merge and the supported configuration management systems. For more details, see the ‘SCMs’ section in the documentation for the Ketura System Settings Page. [I10324]
  • A visual indication has been added to show whether the p4 and svn paths in the Preferences window are correctly set. [I10543, I10542]
  • The detection of character encoding based on <?xml ...> XML processing directives within files has been improved so that Merge will only use such a directive if it is the first non-whitespace content within a file. [I10512]
  • AppleScript examples have been added to show how to launch image and binary comparisons. [I10398]
  • Support has been added for determining from AppleScript whether the Standard or Professional Edition of Merge is installed. An example script showing how to do this is included with Merge. [I10458]
  • It is now possible specifically to request a binary or image comparison from an AppleScript script. [I10397]
  • By default, filenames with the .xsl extension are included in the list of file types handled by the XML/XHTML filter. [I10472]
  • The Comparing Text Files (or Typed/Pasted Text) help topic has been updated to mention that password-protected documents can’t be processed by the text extraction filters. [I10482]

Defects fixed

  • Merge no longer crashes if a merging button is used immediately after adding a synchronization link. [I10506]
  • In certain circumstances, a crash in the 64-bit version of Merge can be caused by a known fault in Apple’s 64-bit Ink input method code (described at http://lists.apple.com/archives/Java-dev/2008/Aug/msg00283.html This link is to an external website). Merge will now detect this crash if it occurs, and suggest a workaround. [I10572]
  • Any change to the default character encoding option in the Preferences window now takes full immediate effect, without Merge having to be restarted. [I10513]
  • Navigating to the next/previous bookmarks and conflict markers within a folder comparison now correctly scrolls the display. [I10570]
  • Merge no longer creates large numbers of log entries when comparing Microsoft Excel or Word documents. [I10559]
  • Columns in tables within the Preferences window are now shown correctly if they have been re-arranged. [I10579]
  • After resizing a column in a table within the Preferences window, the mouse pointer now reverts back to the arrow image, instead of staying as the resize indicator. [I10578]
  • The documentation relating to line numbers in the Add Synchronization Link dialog has been corrected. [I10574]
  • Certain debug diagnostic messages have now been disabled. These had been left enabled accidentally, resulting in unneeded messages being written to the system console log. [I10569]
  • When closed, Merge will now prompt to save any unsaved text that has been typed into an empty text comparison pane in a text comparison created from an image comparison using the View > As Text Comparison menu item. [I9957]
  • A link within the Integrating with Source Control, Configuration Management and Other Applications topic has been fixed. [I10507]
  • HTML comparison reports now work when literal tab characters are present in regular expressions set in the Expressions page of the Options dialog. Previously, such characters were not being handled correctly, resulting in an error when HTML reports were created. [I10485]
  • The Display help topic has been updated with the correct key combination for enabling/disabling file panel linking when scrolling.
  • Dropping a shortcut from Finder onto a file panel now results in the target file being loaded. [I10444]
  • It is now possible to delete a file that resides on a network share when that file cannot be moved to Trash. Previously, an error would occur if the file being deleted could not be moved to Trash. [I10610]

Merge 2008.3580 (5 September 2008)

This was a previous production-quality release of Merge 2008 for OS X. All users are encouraged to upgrade to the most recent version.

Enhancements

  • Although it is useful for Merge to be able to extract and compare the text from proprietary formats such as Microsoft Word, using these text extraction filters when comparing files in a folder comparison can significantly slow down the comparison. A new setting, Use filter programs in folder comparisons has therefore been added to the File Comparisons > File Types page of the Preferences window. [I10450]
  • Instructions for integrating Merge with Xcode have been added to the Integrating with Source Control, Configuration Management and Other Applications page. [I10440]

Defects fixed

  • A problem has been fixed that sometimes caused the text extraction filter for Microsoft Word documents to fail with the error code 0x80004005. [I10439]
  • The Microsoft Excel .xlsx text extraction filter has been fixed so that it can handle certain spreadsheets that it previously could not read. [I10442]

Merge 2008.3571 (13 August 2008)

This was a previous production-quality release of Merge 2008 for OS X. All users are encouraged to upgrade to the most recent version.

Enhancements

  • Merge now supports file filters to extract the content from from certain common types of files when they are loaded. This means, for example, that you can drag and drop a pair of Microsoft Word documents onto a Merge text comparison window and have the text comparison automatically extract and compare the text from those documents. For more information, please see Comparing Text Files (or Typed/Pasted Text). [I10098, I10189]
  • A file filter is also provided to convert a binary .plist file into XML when loaded, and to convert it back upon save. This means that binary .plist files can now be compared, merged and saved.
  • The ability to format the display of XML and XHTML files (without changing the underlying text) in text comparisons has been added. This enables some XML files to be compared more easily. Please see Comparing Text Files (or Typed/Pasted Text) for more information. [I10257, I10254]
  • In text comparisons, Merge now offers an optional panel to display the current lines above one other. [I9353]
  • Files can now be dropped onto the Merge dock application icon. [I9807]
  • A web link, How to Install.webloc, has been added to the Merge distribution .dmg disk images. [I10106]
  • Double-clicking on a {}[]<>() character will now select back/forward to the matching opening/close character. [I10258]
  • Support for integration with a future release of Ketura has been added. [I10358, I10319, I10357, I10327]
  • It is now possible to wait for a report to finish being generated using the AppleScript API. [I10306]
  • The display of space and tab characters can now be toggled on and off. [I10267]

Defects fixed

  • Merge no longer crashes when an image comparison is launched from Find Duplicate Files. [I10118]
  • Merge now reports an error when attempting to reload an externally modified file that can no longer be read. [I10064]
  • The integration of Merge with Time Machine now works with Time Capsule. [I10281]
  • The Continue button is now positioned correctly in the Some of the compared files have been edited sheet. [I10169]
  • Descriptions of the Search size and other controls for binary comparisons have been added to the online help. [I10231]
  • Performing a Merge operation immediately after deleting an unchanged line no longer causes problems. [I10265]
  • The mounted volume name of the Merge for OS X 10.4 distribution .dmg file been changed to include ‘for OSX 10.4’. This enables you to see whether you have the Leopard or Tiger .dmg mounted. [I10114]
  • The Compare with Araxis Merge context menu item in Finder now causes Merge to be given focus. [I10033]
  • Opening a saved comparison will now work reliably when you answer ‘Yes’ to whether to use the saved preferences. [I10066]
  • The interaction of folder comparison filters and file items provided by virtual file system plugins has been corrected. [I10128]
  • High port numbers now work in svnhttps URLs. [I10170]
  • The username field in the virtual file system plugin username/password/host window is now editable. [I10350, I10310]
  • It is now possible to see the end of a long file panel title that is too wide to be visible all at once. [I10322]
  • Certain binary comparisons no longer make Merge hang. [I10294]
  • Merge now identifies CR line endings (Mac Classic) and LF line endings (Unix and Modern Mac) as different (unless the option to ignore line ending differences is in effect). [I10278]
  • Cancel button on Perforce user/password prompt now works. [I10320]
  • It is now possible to change the default HTML and Ruby syntax highlighting colours. [I10181]
  • Folder comparisons now correctly handle circular hard-links within a folder hierarchy. [I10072]
  • An error message with code 0x80010004 should no longer appear in certain circumstances when trying to open a recent Subversion comparison. [I10216]
  • Custom titles file file panels (for example, specified when launching Merge using the command-line compare utility) are now also used in the comparison window title bar and in the Window menu, in addition to the comparison pane header. [I10139]

Merge 2008.3487 (27 March 2008)

This was a production-quality release of Merge 2008 for OS X. All users are encouraged to upgrade to the most recent version.

Changes in this release

  • Annoying (but benign) messages relating to x86_64 architecture support no longer appear in svnX when Merge is used from the svnX Subversion GUI client. [I9994]
  • The command-line utilities now give Merge focus when a comparison is launched. [I9993]
  • The creation of HTML reports uses somewhat less memory than before. [I10043]
  • Once support has expired for your serial number, Merge now notifies you on start-up once every thirty days. [I9949]
  • The EULA that is displayed when you open the Merge disk image has been updated to be consistent with that in the online help. [I9979]

Merge 2008.3469 (10 March 2008)

This was a production-quality release of Merge 2008 for OS X. All users are encouraged to upgrade to the most recent version.

Changes in this release

  • The OS X v10.5.2 update fixed a problem with folder browse dialogs that was exhibited in 64-bit applications under OS X v10.5.1. Consequently, it is strongly suggested that ‘Leopard’ users run v10.5.2 or later.
  • The Standard Edition of Merge no longer lists three files in window menu and title bar when an attempt is made to open a three-way comparison (a feature available only in the Professional Edition). [I9803]
  • In binary comparisons, warning messages are now displayed in empty panels rather than dialogs. [I9804]
  • A Refresh button now appears in binary comparisons when non-automatically applied display options are changed in the Format drop-down list box. [I9810]
  • The folder comparison context menu now has Reveal in Finder and Open with Finder menu items. [I9539]
  • Error handling has been improved when there is no file system plugin to enable Merge to build a list of files and folders. [I9827]
  • Cmd+Right Arrow now works correctly following a Find... operation. [I9831]
  • The SCM integration help topic now contains instructions for integrating Merge for OS X with the latest Perforce P4V version. [I9938]
  • Integration instructions for svnX, a graphical client for Subversion, have been added to the SCMintegration help topic. [I9860]
  • ‘SystemFlippers: didn't consume all data for long ID’ errors are no longer generated when Merge is invoked from svnX. [I9932]
  • Various minor corrections have been made to the online help. [I9840, I9942]
  • The Please email me about significant new product releases option in the registration dialog is now checked by default. [I9849]
  • If a three way folder comparison is started from Finder, Merge now displays three folders immediately. [I9909]
  • Merge now skips .DS_Store files when automatically merging folder comparisons. The changes that Merge was sometimes making to these files during an automatic merge was causing Finder to crash. [I9915]
  • Ctrl+Left Click now brings up the context menu in folder and text comparisons. [I9812, I9946]
  • Ctrl+Left Click on merging buttons now brings up a context menu. [I9934]
  • Ctrl+Left Click now works on edit markers, conflict markers and bookmarks. [I9935]
  • Toolbar button tooltips now work in a three-way text comparison. [I9937]
  • When copying files in a folder comparison, Merge no issues an inappropriate warning regarding replacing files when copying a folder and its files to a location that doesn’t already container a folder with the same name. [I9941]
  • Merge no longer causes a Connection Failed dialog to appear when used with Time Machine backups over a network. [I9944]

Merge 2008.3430 (11 January 2008)

This was the preview release of Merge 2008 for OS X. All users are encouraged to upgrade to the most recent version.

Changes in this release

  • Mac-specific online help is now provided. [I9516, I9798].
  • All the functionality intended for the production-quality release is now present.
  • Many bugs have been fixed.

Known issues

  • When running under OS X v10.5.1 ‘Leopard’ on 64-bit systems, file and folder browse dialogs require two mouse clicks on a folder to show the contents of that folder. This is a defect in OS X v10.5.1, and is fixed in OS X v10.5.2. As a work-around, you can run the 32-bit version of Merge by right-clicking on the Araxis Merge application icon, choosing Get Info, and then checking the Open in 32 Bit Mode checkbox. [I9654]
  • In folder comparison windows, Ctrl+Left Click fails to bring up the context menu. Right-clicking on a two button mouse does, however, bring up the menu.
  • The online help on this website is slightly more up-to-date than that provided with the product.
  • When Merge is used with a Standard Edition serial number (which enables only two-way comparison and merging), if an attempt is made to load three files into a two-way file comparison, Merge correctly loads two of the files, but still lists three files in the application title bar and Window menu. [I9803]

Merge 2007 early-access test releases

Merge 2007.3371 (28 November 2007)

This is an early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

Changes in this release

  • The product download has been split in two. One download for use on OS X v10.5 ‘Leopard’, and another for use on OS X v10.5 ‘Tiger’. The v10.5 download supports 32-bit and 64-bit Intel and Power PC platforms. There are still some problems with 64-bit Cocoa though, so if you are affected, you can use the Get Info window for the Araxis Merge application icon to force it to run in 32-bit mode. In particular, the file/folder browsing windows may require two clicks on folder items in order to disclose their content.
  • Integration with Time Machine has been added. When a compared file or folder has one or more backups available, the Versions button next to the path text field will light up and can be clicked to access a list of previous versions that can be compared.
  • Image comparison printing support has been added.
  • Image comparisons should be more responsive when comparing PDFs, and a bug that could cause an incorrect number of page to be displayed has been fixed. More zoom levels have been added.
  • Folder comparisons will no longer follow symbolic links when traversing folder hierarchies. You can manually follow these links by double-clicking on the relevant row in the results list.
  • Some problems saving files with a deliberately incorrect encoding have been fixed.
  • The encodings list shown when saving reports is now filtered to include only those encodings that are supported by Safari and OS X’s XML parser.
  • File/folder icons should now appear correctly when comparing relative paths in the folder comparison window.
  • The Subversion plugin now supports https:, file: and svn+ssh: protocols. Use svnhttps:, svnfile: and svn+ssh: in Merge for these protocols.
  • A variety of other bugs have been fixed, and tweaks made.

Merge 2007.3327 (23 October 2007)

This is an early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

Changes in this release

  • The Finder contextual menu plugin now shows the Merge commands.
  • Resizing knobs have been added between file panels.
  • Bookmark setting/editing in Binary comparisons should now work.
  • Dimming for lines marked as resolved should work.
  • The checkboard colours used by image comparisons to indicate transparency can be configured in the Preferences window.
  • A progress window is displayed when opening/saving large comparison files.
  • Various ergonomic tweaks to the comparison windows (position on first change, focus setting, etc).
  • Ctrl+A and Ctrl+E should now work for moving to start/end of line.
  • Select Changed and Compare Selected buttons have been added to folder comparison toolbar. You might need to customize the toolbar content to add them if you've been using earlier Merge builds.
  • The list of manually hidden files/folders in a folder comparison window is now included in saved folder comparisons.
  • The Swap menu commands should now work in Folder Comparisons.
  • The linking lines panel width option should now work.
  • Syntax highlighting colours can now be edited in the Preferences window.
  • Support for Apache-hosted Subversion repositories has been added. Just use svnhttp:// as the URI scheme instead of http://. svn:// only works with repositories hosted by svnserve.
  • Inline regular expression editing should work again.
  • Bookmark tooltips should appear more reliably now.
  • Text comparison word selection has been tweaked. Underscore characters no longer count as word boundaries.

Merge 2007.3291 (31 August 2007)

This is an early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

Changes in this release

  • Preliminary, but incomplete, binary comparison support has been added.
  • Text comparison bookmark tooltips are enabled.
  • Two problems encountered on Leopard seeds have been fixed.
  • Cmd+N key equivalent added.
  • Mouse/keyboard/selection interaction in comparison windows has been added/fixed/tweaked.
  • Most table views should now remember column sizes/orders.
  • Relative path matching is support in folder comparison filters has been integrated from Merge for Windows.
  • There is now increased status bar activity during folder comparisons.
  • The folder comparison selection handling when launching comparisons has been changed in response ot several customer requests.
  • Occasional problems with preference changes taking effect after Apply or OK have been fixed.
  • File type patterns can now be used to override UTIs.
  • A few tweaks to the scripting dictionary have been made.
  • Some problems with the Subversion file system support have been fixed.

Merge 2007.3251 (30 May 2007)

This is an early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

Changes in this release

  • A plugin to enable access to Subversion repositories has been added. svn:// URIs can now be used in file and folder comparison windows. The path to the svn command-line program needs to be set in the Subversion section of the Application preferences page first.
  • Left/Home/End keys now behave sensibly in the folder comparison results list.
  • Various changes have been made to Merge’s scripting dictionary.
  • Some performance improvements have been made to folder comparisons.

Merge 2007.3242 (10 May 2007)

This is an early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

Changes in this release

  • Image comparisons are now supported. Merge uses registered UTIs (Uniform Type Identifiers) to decide which type of comparison window to use when launching comp folder comparison window. The file type options in the Preferences window are ignored, and will probably be removed. Merge supports the image file formats listed in Chapter 7 of the Cocoa Drawing Guide.

  • Text, folder, and image comparisons can now be saved/loaded.
  • Various quirks have been fixed.

Merge 2007.3232 (11 April 2007)

This is an early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

Changes in this release

  • There is now a drop-down menu on the Preferences toolbar button.
  • Accessibility and Services support has been added to the text panels.
  • Folder comparison loading/saving has been implemented.
  • Comparison window size is now remembered.
  • File/folder copying is now supported.
  • Three-way folder merging has been added.
  • Character encodings are shown in the file history windows.
  • More of the folder comparison commands have been enabled.
  • Line endings should now be converted correctly when transferring text to/from the clipboard.

Merge 2007.3210 (13 March 2007)

This is an early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

Changes in this release

  • Command-line utilities have moved out of the application bundle to a Utilities folder in the Merge disk image.
  • There is an experimental araxissvndiff command-line utility (in the Utilities folder) that can be used with Subversion. araxissvndiff3 is not yet complete.
  • Toolbar support in text and folder comparison windows has been enabled.
  • The file-copying features in the folder comparison window are not yet complete. We recommend avoiding these features for the time-being.
  • A variety of bugs has been fixed.
  • General note: When choosing Araxis Merge as an external diff program in other products, select one of the compare, araxisp4diff, or araxisp4winmrg command-line utilities, and not the Araxis Merge application itself. The Merge application icon does not currently accept dropped files or command-line arguments.

Merge 2007.3198 (26 February 2007)

This is an early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

Changes in this release

  • Perforce URIs should now work. The Application preferences page contains some settings that will need to be filled out.

Merge 2007.3194 (22 February 2007)

This is an early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

Changes in this release

  • Text comparison printing mostly complete.
  • Headers/footers should now work properly in text/folder comparison printouts.
  • Some fixes for problems with the command-line tools (compare, araxisp4diff, etc) have been made.
  • Some experimental fixes for obscure Keychain-related problems have been implemented.

Merge 2007.3160 (24 January 2007)

This is the first public early-access test release of Merge 2007 for OS X. This release is not of production quality and is provided ‘as-is’, with no warranty. Use at your own risk.

  • Many of the features present in the next major Windows version of Merge have not yet been implemented, or are incomplete.
  • Some features might not work correctly, so caution is recommended, particularly when using Merge to modify files. Please take backups before saving over valuable files. Your attention is drawn the ‘no warranties’ disclaimers in the EULA.
  • The application is, in places, still unpolished: dialogs may not be arranged correctly, and artwork may not be final.
  • The online help included is that for the Windows version of Merge.