ECMerge Pro (Windows) 2.3
ECMerge compares and merges local, FTP/S, VCS repositories texts, images and folders, side-by-side or 3-way.
You can compare not only text files or simple images, but as well OpenOffice Text files or Microsoft Word DOC/DOCX and RTF documents. It unzips ZIP archives automatically as well. ECMerge recognizes many "file converters" automatically letting you compare e.g. PDF or WordPerfect.
ECMerge has extensive capabilities to help you compare efficiently your source code (such as syntax colouring, comparison within lines, XML pretty-printing...)