Drasbek Diffn Merge - 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).

Recursively compare and synchronize trees of folders and files to find the differences both in file presence and file contents.

Features:

---

Recursively compare folder trees side by side.

Synchronize folders by keeping newer files.

Compare text files side by side.

Compare HTML documents side by side using browser structure. Supports files and URLs.

Automatically merge text files by inserting changes as programming language comments.

Supports C/C++/Java, Visual Basic, Delphi and HTML/XML.

Point and click the changes to include into the merge result.

Freely edit the merge result before saving it.

All comparisons are fast and easy to use.

Search for changes or plain text.

Color coding makes it easy to locate changes.

Synchronized scrolling of both folder and file compares.

Compare snippets of text (copy and paste lines from other texts).

Compare while ignoring leading/trailing or inline whitespaces.

Compare while ignoring letter case.

Folder bookmarks to easily load frequently used folders.

Color panels for easy file compare navigation.