Support for ECMerge Standard (Linux) is available from the publisher site.
Short description: ECMerge compares and merges safely your files and folders, side-by-side. It provides syntax colouring for many languages, supports many office and archive formats, pretty prints XML. It generates patch/XML/HTML reports for review or reuse....
