• Added on option which lets a bounding process run ECMerge with a provided serial number (--serial="licence-key"), allowing bundling of ECMerge to be totally independent from the installed version and its configuration

• Fixed: Writing inclusive merge result in 2 way would not put markers around second side on conflict
• Default 'Save' action on close now saves the result, no more an ECMS/ECMT.

• Running folders in GUI mode from command line disables --lockedui mode
• New options (include/exclude patterns) available from the OptionsSet objects
• Fixed double question for: 'File write protected, do you want to check it out?'

• Added System.Process and System.Synchronization hierarchies to run process and wait for their termination
• Added "properties" member to URL and parameter to new URL letting all the advanced options be used from scripting (multi-connection, SCC branches/labels browsing, encryption flags...)

• Added an option to let the user choose between saving the settings in the "local settings" section or in the normal roaming section of the user profile.

• Added is_in_fully_solved_state function on Document object
• Added --pdl-script and --pdl-script-text command line options
• Added new function RegExp.execBackward which has the same specification as RegExp.exec but searches backward for the regular expression

• Documented Application.script_url variable, already available since first 2.1

• Source Code Controls
  You need to install the command line tools for that SCC. Generally you will not need any specific configuration thanks to auto-detection fonctionality.
  
  On Windows, we support CVS (1.11 and before, 1.12 and after), SubVersion, ionForge Evolution, Perforce, VSS, Code Co-op (check-out only).
  On Unices, we support CVS (1.11 and before, 1.12 and after), SubVersion, Perforce
  • Browsing
    You can now browse the content of several source code controls repositories.
  • Checking files out
    You can also check files out for those SCC for which it is natural.

This system is extensible and adding a new SCC is generally easy. Please contact us if you would like to have another SCC supported.

• Scripting and User Macros
  An ECMAScript compatible scripting engine is now included in ECMerge. It lets you run comparisons, synchronization, retrieve statistics, produce reports, script the text editor, the views... 40 dedicated objects are available to script the comparisons, hundreds of settings were made available: all the power of ECMerge at hand!

• Unix Patch Import
  You can now apply Unix patches within ECMerge. More importantly you can preview the application before saving. Single and multi files patches are supported, together with files deletion semantics, fuzzy matching...

• Keyboard Shortcuts
  The keyboard shortcuts for any menu item can be changed. New shortcuts can be added for user macros, or command which prove to be used often. You can re-assign existing shortcuts to your preferred commands rather than ours!

• Full featured command line
  The command line is able to run differentiations and merge directly for files and folders. Run on a differentiation, it will now export a textual report to the standard output by default. It is able to run scripts as well. The command line now also returns a meaningful value all the time (when run for merge).

• Added Mac OS X x86 platform

• Greatly improved search and replace features: ECMerge can now search for regular expressions (both for text and file names), replace all matches in selections, searching within differences. Folders can rename multiple files at a time using regular expressions and replacement patterns.
• Added (optional) tips on startup, it can help you get more of ECMerge.
• Added 'simulate' question to run a simulation of the merge operations (use --yes=simulate to activate it during initial operations)
• Added 'inclusive-merge' question to allow saving merged files with conflicts using the inclusive merge (use --yes=inclusive-merge to activate it during initial operations)
• Added many descriptive flags for converters and made activation more flexible (through scripting), added auto-detection built-in script. Installing a converter is then just matter of asking us a detection scripting and pressing a button.
• Fixed bug of 2.0: refreshing would not re-apply filters
• Fixed bug of 2.0: extensions fields to force comparison of a given type where not always well reloaded to the panels while well applied 
• Fixed bug of 2.0: focus was not given to find combo field but to the find box itself, which was not practical
• Fixed bug of 2.0 occurring at save time: undo stack could actually coalesce more actions than expected together; making undo difficult to use.
• New --watch-merge command line option

• Improved installer keep the installation language for latter execution
• Documented unattended installation

• The Generic Copy feature now copies items in parallel (it uses as much connections as available). It makes SCC copies and/or SCC to FTP deployment very efficient.
• A Check-out menu item was added
• View and Edit menu items have been merged into View which actually runs View if the file is read-only and Edit if it is read-write.
• Improved the combo boxes MRUs so that they do not keep in mind URL to temporary location (when using folders filters)
• Fixed a bug of 2.0 which could cause a crash in particular run conditions
• New path based filtering

• Typing in a View-only file proposes now to unlock it, if it is under a SCC Mapping, it proposes to check it out.
• Added option to insert spaces when pressing TAB key
• Fixed a bug of 2.0 which could provoque data loss when using a sequence of edition such as: Open, Edit, Save [, edit, save...], Swap to read-only, Swap to read-write, Save.

• Large numbers are now displayed better (with a thousands' separator) 
• Unix patches are now more compatible when handling missing files 

• Fixed a problem with particular serial numbers

• Fixed editing source combo then clicking browse button combination, the latest edition was ignored
• Improved Help Window, keeping font and other settings

• Tooltip on file name is now made of the entire path
• Recursive removal now handles better read-only files and does not enter any more symbolic links to folders
• Fixed an error writing results, which could happen when using auto-merge

• Fixed a problem when reloading ECMS files: in certain conditions, "Inconsistency found" message would be displayed.

• Fixed launch parameters in Windows Explorer extension, the factory settings were used rather than the default settings
• Fixed Unicode file name handling in Windows Explorer extension, now a Unicode build is deployed on WinNT/2K/XP/Vista

• Added documentation to explain how to remove ECMerge with only two commands

• Fixed Folder font options

• Fixed Shift-F3 backward find, would go forward after some searches
• Fixed Shift-F7 Previous Difference, would jump some differences

• Added "Resolve with" documented shortcuts to the Right-Click Menu and to the toolbar's tool

• Fixed: rename function would fail silently
• Fixed: browsing top folder of servers with an entry path

• Configuration file now uses a new name each time forward compatibility is not insured (allowing parallel installations)
• Improved Find box (Find/Replace MRU, Wrap option, Mark All, Replace All)
• Improved Windows List dialog box (handle double-click to activate, del/backspace to close), added a shortcut to get it
• Dropping a file system item on the empty or error view opens this item in the panel
• When swapping between 2 way and 3 way differentiation, the ancestor source is remembered
• Fixed: (Under Win9x only), dragging files from a folder view cause a wrong drop (filenames are split at each character)
• Fixed: When starting a drag, the selection is sometimes reset to a single item near the start of the drag
• Fixed: Multithreaded comparison scheduler is not stopped during copy operations, and may interfer during file loading
• Fixed: Win9x/Me have very tight GDI limits preventing more than approximately 18 diffs or 90 editors, using more than these numbers may crash. The application implements a hard limit (12 views)

• German and Italian translations
• Improved notebook design (add close button to the tab, navigation arrows)
• Improved application icons
• Much more toolbar options are now available. Toolbars can be dragged, docked and hidden.
• New "Document Type" combo allows you to switch document type dynamically for given sources (for example, to compare binarily text or images, or compare text source of XPM images)
• Output locations selectors (glasses/database write arrow icons at the right of source selection Browse Menus) replace previous Select as Output Location menu item, as well the Selection Output Location dialog box and option panel
• Can now jump from View/Edit mode to Comparison mode by pressing 2/3 button in the toolbar
• Accelerated various boxes and Views closure

• Active / Passive connections
• FTP over SSL (using AUTH TLS/SSL or using implicit SSL connections)
• Comparisons are done very efficiently (on large sets of small files Ellié Computing Merge goes much faster than several of our concurrents by using multiple parallel connections, and the "numerous small files" case is the common case with web sites)
• A log view can be enabled to show you the potential connection problems
• Various options allow you to use anynomous login, passwords, SSL certificate authentication, server authentication

• Added Auto-Indent

• New in-line merge features helping resolution of Change/Change conflicts
• Enabled word wrapping in differences (making comparisons of long lines more practical)
• Improved line synchronization in heavily modified text files differentiations

• Supports web formats (PNG, GIF, JPG), plus many others (BMP, XPM, TIFF...)
• Several differentiation algorithms (Blank similar which overlays two images and blanks similar areas, Difference which shows directly arithmetic colours components difference, accumulated or chanel per chanel)
• Zoom, stretch and alignment
• New image XML and HTML report, differences and thumbnails and images are generated as PNG (all of them are optional), metrics are output in XML/HTML (PSNR / MSE, exact/similar/different pixels count)

• Copy / Paste to the sources combos work and keep all the connection parameters
• Added "Select Bookmarked Items" menu item
• Added a warning limit when opening numerous views from a Folder
• Added comparison re-scheduling code which favours currently viewed items
• Plus, minus and star key now operate on the entire selection, rather than the current item
• Added grouping of folders (optional, to Top or Bottom)
• Added sort by any column (name, size, MIME type, differences count)
• New filtering options in 3-way mode (excluding file which are unchanged only at left/right, this is very practical to show a subset of what one co-worker only changed)
• Case sensitiveness of file names comparison is now an option
• Right click menu Open commands have been improved, drag'n'drop as well 

• Text editor would always ask for new file name when saving a file opened from MRU combo
• Added dynamic language handling. Simply adding a directory with a language code and the right files inside it (lg.xml, report.xsl and .po files) will show new language in Language / Application box. If you want to translate Merge, please contact us, we will give you explanation and material to easily translate the software. We can give free licences to translators
• Renamed "File Comparisons" into "Text Comparisons" in order to prepare for other types of differentiations
• Improved memory footprint of the statistical engine as well as its speed
• Fixed some translations
• Improved documentation
• Simplified Licence

• Default comparison option is now set back to "Check files content if date or size are different"
• Fixed problem stopping idle comparisons
• Fixed crash when using backward find on  fully empty differentiation

• Fixed crash in XML Filter on some mal-formed XML
• XML Filter defaults were changed from "All tags" to "Tags with no spaces", which should have been the default (because it gives far better results)

• Fixed bug in binary file report using monochrome rendering
• Fixed bug generating simple binary reports from command line
• Fixed bug preventing report generation when using relative paths from command line
• Fixed bug in folder reports forcing column widths to inappropriate values
• Fixed least/most recent icon background bug in IE
• Added explanation on how to print HTML reports from IE, Mozilla, Netscape with best rendering
• Added new details within the files differences statistics in folders report
• Added explanation about last Changes Count column in folders report
• Added information about changes inside conflicts for text files, making it easier to evaluate the actual time to solve these conflicts
• Added new option "Format lines in a single column for identical parts", this new option is activated by default
• Added information about actual loading encoding for files
• Changed HTML reports graphical design to follow Ellié Computing website
• Reduced the size of generated HTML reports (up to 30% in common cases, theoretically up to 70%)

• Fixed a wrong message when it is not possible to Unlock a file (make it writable)
• Fixed a crash when trying to use Open again... menu item
• Used a better size for date/hour controls in Options panel
• Improved the rendering of some UI elements (buttons, live-update for splitters...)
• Improved drag'n'drop (dropping 2 or more files on combo is handled as in the top level frame, can drag'n'drop a sub-folder in a folder view to replace the root of differentiation without having to press Control key)

• When dropping several files, the UI would not ask if they are to be compared or opened individually

• First release for this platform, installable as a standard SunOs package

• Fixed a regression bug when trying to open a binary comparison from command line
• Fixed a regression when using the "Fill from clipboard" menu item in text mode
• Fixed a regression when reloading folders documents (particular actions could provoque "Document not recognized" error)
• Added handling for 32 new encodings on Windows (ISCII, Chinese, Japanese...)
• Improved the behaviour of the software when it is not possible to make a backup file prior to saving (text views)
• Fixed a visual bug in time field of "Filter by date" panel
• Improved transitional memory overhead when loading large text files or pasting large texts
• Added link in demo/test welcome screen to check if a newer version of the soft exists

• Renaming a file or folder in folder view would overwrite target file without confirmation

• Fixed display problem in Text Comparisons HTML report generation: now constraint the file contents display to the screen width even with very long lines of text making the reports suitable for printing
• Improved rendering of monochrome reports
• Fixed Ctrl+TAB view navigation on Linux
• View navigation gives focus to last used source
• Searched text is now selected when opening Find box
• Default action in Folder view is now to Open Diff is diff mode, Merge in merge mode (rather than always Diff)
• Added shortcut for Delete (Shift+Delete key) in Folder view
• "Set text output options" is now always available for Folder (even in Diff mode) to allow converting Generic Copy
• Markers, ignored items and resolutions actions in Folder view are kept in more situations making a document easier to re-use

• Fixed a bug preventing reload of certain ancient ECM? files
• Fixed a bug which discarded markers and ignored items at save time in rare conditions

• Default installation now works out-of-the-box in most Linux systems (kernels 2.4 / 2.6)
• Added a "Web browser" command line in the Commands panel of the Application Options. This command line is used as a fallback, if the system settings to launch a web browser cannot be found or used.

• ECMerge is now multi-threaded, for a better resource usage on new Dual Core and multi-processors computers
• Converters
  Files can now be preprocessed by user-defined converters. This allows to export PDF/Word files to plain text, or ZIP archives to folders.
• Reports
  Patch, XML and HTML reports can be generated on both File and Folder Comparisons. Many customizable options. Define recurrent comparisons as .ecmt files and generate merge reports periodically. Reports in Folder Comparisons can be generated on the whole hierarchy, or on the selected/bookmarked items.
• Comparisons statistics
  Displays a dialog box with the summary of the comparison: number of changed, unchanged, inserted, removed, ignored items. Comparisons statistics in Folder Comparisons can be generated on the whole hierarchy, or on the selected/bookmared items.
• Options sets
  Define several sets of options you often use for Text or Folder Comparisons (comparison options, filters, converters, display). When opening a new comparison, you can select which set of options to use for it.
• Find feature change
  ECMerge now finds the same text in all opened documents.
• Pure command line application
  On Windows, a pure command line executable is delivered to be used in batches. On Unix, an argument can be specified to force pure command line behaviour.
• Spanish translation
• Filters by date
  Specify some date-based criteria to hide files and exclude them from the comparison
• More filters by status
  Capability to hide files or folders present or missing in any of the hierarchies. Capability to hide all folders that do not contain any visible files.
• Show/hide hidden files and folders
  Files and folders that were excluded from the comparison (regarding Name/Status/Date criteria) can be displayed in the Folder Comparison view, using the colour assigned to "ignored" items.
• More comparison heuristics
  ECMerge now handles more heuristics to apply on files, so as to determine whether they are equal or not regarding the specified criteria (based on date and/or size information). When these heuristics do not determine the file status, ECMerge will perform a content comparison.
• Time zone adjustment
  Capability to set an offset for any of the folders hierarchies.
• Generic Copy from one source to another
  ECMerge opens a dialog box to test/perform a copy action from one folder hierarchy to another one. This dialog box shows how many file/folder creation, deletion or copy will occur. The user can choose not to do some of the predetermined operations.
• Write merge result confirmation box
  equivalent feature to the "Generic Copy", when writting Folder Merge result.
• Comparison views can now be displayed horizontally or vertically
• Folder Comparisons specific display options:
  ancestor and right hierarchies indentation is now optional (only in vertical display),
  the date column can display an icon to show the newest/oldest file, or the date text,
  added a column with the number of differences between files.

• fixed a bug which could corrupt part of the content of the editor and could lead to the crash of the application

• added a "limited demonstration" behaviour when no evaluation serial number is entered
• the software now exists as two editions (Standard and Professional)
• in-line differences, at word and/or character level
• XML pretty-printing and compacting functions to display properly XML files
• dynamic loading of files and folders for comparisons and merges. You can now open an empty window for comparing and merging files and folders, and then, specify which item to use as left, ancestor or right source. You can also fill a text source from the clipboard.
• added security distance when merging 3 files to attract user attention on dangerous merges
• better encodings handling at loading and saving time. Each file/folder defined as source or result of a merge can have its own encoding. For folder merges, a default encoding can be specified so that created files are automatically converted when written (useful when synchronizing folders hierarchies with different encodings).
• better line endings handling at saving time. You can now force a line ending character to be used when writting a file (useful when synchronizing folders hierarchies on different systems using different text line delimiters).
• added options corresponding to XML pretty-print/compact and in-line differences features
• all Options-like dialog boxes now remember the last section displayed when dismissing the window, so that it is reopened on the same section.
• added some keyboard shortcuts for many commands (open options dialog boxes, navigate in differences and conflicts, ...)
• in a Text Comparison view, the comparison summary is displayed in the status bar
• improved speed of application when switching from a Text Comparison view to a Folder view
• added a contextual menu in Text Merge view to solve conflicts contained (even partially) in selected text.
• fixed various bugs

• fixed various bugs
• improved speed of drawing and navigation in Folders Comparison view,
• reduced flickering when opening a new document (new tab).

• version for Linux,
• syntax colouring,
• Windows file Explorer context menu integration,
• French localization.

• 3-way diff/merge,
• Files and folders,
• Many customizable options,
• Integration with famous SCM.