Special Offer for wxWidgets Community: see below for details.
- * Compare and merge text, source code files, web pages.
* Compare text documents in proprietary formats (PDF, Microsoft Office, ...) and ZIP/RAR archives by configuring third-party tools to preprocess the input items.
* Compare and synchronize folders.
* Side-by-side or 3-way comparison (using a common ancestor).
* The text editor supports around 100 different encodings.
* Reports generation (Patch, XML, HTML) for both files and folders.
* Comparisons statistics
* Intuitive interface, many customizable options.
* Syntax colouring for numerous languages (C/C++, Java, HTML/XML, ASP/PHP, SQL, Python, Makefile, ...).
* Integrated with most famous SCM.
* Integrated with Windows file explorer.
* Save current merge task and finish it later (restores all conflict resolutions, even if modified by hand)
* Prepare recurrent comparisons (sources, comparison options, reports options) and open them in one click, or generate reports from the command line.
* Available as 2 versions (Standard and Professional).
* Runs on Windows and Linux (x86).
* Multi-threaded application for a better resource usage on new Dual Core and multi-processors computers
* Localized to English, French and Spanish. (more languages to come).
* Fully functional trial version (30 days).
wxWidgets users are elligible for a 30% rebate on ECMerge Standard and Professional versions. You just need to create an account on Elli