ECMerge compares and merges safely your files and folders, side-by-side. It provides syntax colouring for many languages, supports many office and archive format, pretty prints XML. It generates patch / XML / HTML reports for review or reuse.