Merge is the visual file comparison/merging and folder synchronization rnapplication from Araxis. English, German, French, International Spanish and rnChinese (Traditional and Simplified) are supported as user interface rnlanguages; translation of the online help to German, French and rnInternational Spanish is underway. A Japanese version of Merge is also rnavailable. rn
rn____________________________________________________________________________ rn
rnBENEFITS: rn
rnFor software engineers and web site developers: compare, understand and rncombine different source file versions. Work quickly and accurately, whether rnyou are comparing individual files or reconciling entire branches of source rncode. Use three-way comparison to integrate changes made by you, and those rnmade by a colleague, with a common ancestor version. rn rnFor release and quality control managers: compare different source code rnbranches to give total confidence that you know and understand every change rnmade to every file for a specific release. Compare product releases to be rncertain that only the expected files have been modified. Create an HTML or rnXML report of changes for audit purposes. rn rnFor code reviewers and auditors: identify in context every change made rnbetween two or three source code hierarchies. Create a standalone HTML or rnXML report of your findings. rn rnOther users: Whether you are working with multiple revisions of text files rnor need to keep multiple folder hierarchies in sync, Merge might help save rntime and reduce errors by helping you to work quickly and accurately.
rn____________________________________________________________________________ rn
rnNEW FEATURES AND CHANGES IN MERGE V6.5 rn
rnNEW/ENHANCED FEATURES rnIt is now possible to create a report in HTML (example), HTML slideshow, XML rnor UNIX diff format for file comparisons. HTML reports are particularly rnuseful for archiving and distribution. See Creating a File Comparison rnReport. Reports may also be created in HTML or XML format for folder rncomparisons (example). A folder comparison report can, optionally, include rnfile comparison reports for some or all of the files involved in the folder rncomparison. Thus it is possible, in one operation, to generate a report that rnis a complete record of all the differences in all of the files involved in rna folder comparison. This is especially useful in code review and code audit rnsituations. See Creating a Folder Comparison Report. Merge v6.5 supports rnEnglish, German, French, International Spanish and Chinese (Traditional and rnSimplified) as user interface languages; translation of the online help to rnGerman, French and International Spanish is underway. Merge tries to choose rna suitable user interface language based on the Regional Settings of the rnhost operating system. It is also possible manually to specify the user rninterface language on the Application page of the Options dialog. Merge now rnprovides a Virtual File System (VFS) API. All access to the filesystem (for rnexample, by file and folder comparisons) within Merge takes place using the rnVFS API. Thus, third-parties are now able to write plug-ins that enable rnMerge directly to browse, for example, configuration management or version rncontrol repositories, FTP sites and web sites. This means that SCM vendors rncan now extend their integration with Merge such that Merge can compare and rnmerge source code branches directly within the SCM repository. Support for rnthe Win32 file system within Merge is implemented using the new VFS API, and rnfull source code to this implementation is provided as an example. It is now rnpossible for users to add synchronization links to tell Merge to re rn-synchronize the comparison at particular points. This is particularly rnuseful in some complex comparison scenarios. Various enhancements have been rnmade to the Automation API.
rn rnAPPLICATION LEVEL CHANGES rnWindows XP theming is now fully supported. Toolbar icons have been updated rnto be more in keeping with Windows XP. Some icons have been redesigned to rnmore clearly indicate their purpose. More features are now available from rntoolbar buttons. Buttons on the toolbars have been re-arranged in a more rnlogical manner. Toolbars can now be customized. There is an option not to rnshow the splash screen when Merge starts. Various defects have been fixed. rnWhere appropriate, these fixes have also been applied to recent builds of rnMerge v6.0.
rn rnFILE COMPARISON IMPROVEMENTS rnFor file comparisons, there is now an option automatically to reload files rnmodified outside of Merge. The default character encoding used by Merge can rnnow be specified. Previously, the system encoding was used by default. The rncommand line compare utility can now be used to perform an automatic merge rnwhen a three-way file comparison is launched. The default list of regular rnexpressions now includes a filter for CVS style comments. File access rnrelated error messages are now shown directly in a file comparison pane, rninstead of in a separate error dialog. This is particularly helpful when rnmultiple file comparisons are launched from a folder comparison. The status rnbar now shows the codepage of the file in the currently selected file rncomparison pane. File comparison panes now support optional line-wrapping. rnSpecific columns or column ranges can be ignored when comparing files. rnSequences of characters matching specified regular expressions can now be rnignored when comparing files. There is a new option in file comparisons to rnshow only a few lines of context instead of large blocks of unchanged text. rnThe EUC-JP character encoding is now supported. Selected lines can now be rnmarked as being resolved. They are then shown dimmed in the same way as rnresolved text following an automatic merge. It is now possible to replace rntext found as a result of a Find operation. Replace can operate within the rncurrent selection instead of the entire document. Merging buttons are have rnbeen made semi-transparent on certain platforms, enabling any text behind rnthem to be perceived. File comparison linking lines are now drawn using rnanti-aliasing on Windows platforms that support GDI+. This improves their rnvisual appearance. There is a new toolbar button to save all modified files. rn
rnFOLDER COMPARISON IMPROVEMENTS rnFolder comparisons are now shown within the main application window (instead rnof a separate window) and participate in the tab strip, if shown. rn
rnIMPROVEMENTS COMMON TO FILE AND FOLDER COMPARISONS rnVarious commonly used file and folder comparison options are now directly rnavailable from a menu associated with the Options toolbar button. The rnWindows Explorer context menu now appears as an item in file and folder rncomparison context menus. There are new toolbar buttons for jumping to the rnNext and Previous change. The double-arrow scrollbar buttons, which jump to rnthe previous and next change within a specific file, are retained. A window rnshowing comparison statistics for file and folder comparisons is now rnavailable. The default header and footer for printing has been improved. The rnpresentation of printed pages has been enhanced. rn
rnOTHER CHANGES rnNew style serial numbers have been introduced. We strongly recommend that rnyou copy and paste serial numbers whenever you need to enter them. This is rnmuch less error prone than trying to type them in manually. A serial number rnis now required to use the Evaluation version of Merge. Evaluation serial rnnumbers are available free of charge from the Araxis web site. Merge rnrequires certain information about the user to be provided when it is first rnrun (including the user's name and email address). This information is rnprovided to Araxis whenever Merge performs an update check. Therefore, rnprovided that you allow Merge to perform update checks, it is no longer rnnecessary separately to register Merge on the Araxis web site following rnpurchase. The information sent to Araxis during Merge update checks has been rnmodified. Users concerned about their privacy should read the Data rnCollection help topic. The Professional, Standard and Evaluation versions of rnMerge are now supported by a single executable. Previously, each variant rnused a separate executable. Merge v6.5 has a new splash screen.
Download File Size:20.76 MB
|
