DiffnMerge

Description
Quick and Easy File and Folder Comparing.
With Drasbek DiffnMerge you can compare and merge files and folders.
Compare two text files and see the differences in the two files side by side, then merge the text files manually or automatically by inserting the changes as programming language comments (C/C++/Java, Visual Basic, XML/HTML, Delphi or Plain). It is also possible to recursively compare and synchronize trees of folders and files to find the differences both in file presence and file contents.
As a special feature, you can compare two HTML documents side by side using the Microsoft Internet Explorer document hierarchy. This makes it particularly easy to compare HTML documents even if the tags are organised differently in the two documents.