ECMerge is a merging and comparison utility for heterogeneous environment teams.

ECMerge compares quickly thanks to its multi threaded comparison engine. It determines precisely the difference between text files, images and folders.

It formats XML files for a better presentation and differentiation. The differences inside lines and the syntax colouring for numerous languages save you a great amount of time.

ECMerge compares not only the files with an ancestor, but as well folders: this is unavoidable when using heterogenous SCC or when your SCC does not save latest ancestor information.

Here are some key features of "ECMerge":

· Fast: ECMerge compares the documents in parallel when they are launched from folders views and profits from Hyper-Threaded as well as Double-Core processors.
· Easy to use: ECMerge highlights differences in side-by-side views and text blocks that are conflicting. Full undo/redo is provided. You can save your work at intermediate situations for text files as well as for folders.
· Source code review: Compare source code to older versions and identify what has changed. Java, C#, C++, Visual Basic, Perl, PHP, Delphi, etc. Syntax colouring helps you to merge by avoiding typo errors.
· Merge: Merge your changes and those of your co-workers based on a common ancestor into one copy. One-click to merge a block of text. Editable output. Unlimited undo/redo.
· Folder comparison: Analyze differences between 2 or 3 folders hierarchies or ZIP/RAR archives and synchronize them, locally or through FTP/FTPS.
· Integrate it in your development environment: Call ECMerge from your SCC solution to perform comparisons and merges.
· Compare and merge text, images, source code files, web pages fast.
· Compare and synchronize local or distant FTP/FTPS folders, as well as numerous VCS repositories.
· Side-by-side or 3-way comparison (using a common ancestor). Why 3-way?
· XML text comparison, in-line differences and merges.
· Comparison and merge of documents in proprietary formats (preprocessed by user-defined converters).
· Unix Patch, text, CSV, XML and HTML Reports generation for both File and Folder Comparisons.
· Intuitive interface, many customizable options.
· Scriptable with ECMAScript
· Graphical interface, command line and component
· Syntax colouring for numerous languages
· Integrated with most famous SCM
· Integrated with Windows file explorer
· Command line interface for batch processing and reports generation
· Cross-platform (runs on Windows, Mac OS X, Linux and Solaris 10)
· Available as 2 versions (Standard and Professional).
· Localized to English, French, German, Spanish and Italian.
· Educational discounts, free licence for Open Source projects (More infos)

Limitations:

· 30 days trial period.

What's New in This Release: [ read full changelog ]

· Fixed bug n°437: folder diff viewer might show wrong type of object for 'special' file systems objects (links, devices...) considering them as folders
· Fixed bug n°438: when failing to encode text files content appropriately when saving to FTP, ECMerge might stop working
· Fixed bug n°439: when FTP authentication fails while loading a binary file, the view might be loaded incorrectly
· Fixed bug n°440: default field in status bar should always be left aligned
· Fixed bug n°441: status bar reports that the image cannot be scrolled but it is scrolled correctly
· Fixed bug n°442: Save and solve works correctly but the user interface does not report it appropriately in folder view