DiffnMerge

Quick and Easy File and Folder Comparing. Compare and merge text files. Explore the differences between folders and files. 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, Plain). Recursively compare trees of folders and files to find the differences both in