Compare It!

Powerful file compare and merge utility. Features: built-in editor with syntax highlighting, undo and wordwrap; highlights changes within lines; editing or fast by-difference merging; printing; html and text reports; zip support; Unicode support; search and replace with regular expressions; manual line matching support; convertors support for non-text files comparison.

.