ECMerge compares and merges local or FTP folders for texts and images, side-by-side or 3-way.
It provides syntax colouring for many languages, supports many office and archive formats, pretty prints XML.
Differences are computed at line, word or character level to help you find small differences quickly. It generates many reports formats, including XML. It outperforms most SCC differenciation tools. Also runs on Linux, Mac OS X&Solaris