1)   ECMerge Pro (Windows) 2.2
ECMerge compares and merges safely your files and folders, side-by-side or 3-way. 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.