Araxis Merge 2007.3

Merge is the two and three-way visual file comparison/merging and folder synchronization application from Araxis. Use it to compare, understand and combine different versions of source code, web pages and other text files, or even text copied and pasted from another application (e.g. Microsoft Word).
Merge is a compelling choice for software developers, lawyers, product release managers, web designers and other professionals who work with multiple revisions of text files, including ASCII, MBCS and Unicode files. Merge integrates with most version control (VC) and software configuration management (SCM) systems that allow a third-party comparison/merging tool to be specified.
For legal professionals: instantly identify every change by copying text from different contract drafts being edited in another application (such as Microsoft Word) and pasting it directly into a file comparison window.
For software engineers and web developers: compare, understand and combine different source file versions. Work quickly and accurately, whether you are comparing individual files or reconciling entire branches of source code. Use three-way comparison to integrate changes made by you, and those made by a colleague, with a common ancestor version. Synchronize a website with its staging area via FTP using the supplied FTP plugin.
For release and quality control managers: compare different source code branches to give total confidence that you know and understand every change made to every file for a specific release. Compare product releases to be certain that only the expected files have been modified. Create an HTML or XML report of changes for audit purposes.
For code reviewers/auditors: identify in context every change made between two or three source code trees. Create a standalone HTML or XML report of your findings. Add bookmarks and comments to a file or folder comparison, then save it as a single-file archive for emailing to other team members for review.