Araxis Merge

Araxis Merge is a two and three-way visual file comparison (diff), merging and folder synchronization application for Windows, created by Araxis Ltd. The article Comparison of file comparison tools compares a number of file comparison applications, including Merge.

A version for Mac OS X is currently under development (as of October, 2007).

Features

• Two and three-way visual file and folder hierarchy comparison
• Full support for ASCII, MBCS and Unicode character encodings (and input method editors)
• Changes highlighted in colour, with linking lines connecting related portions of files
• Point-and-click merging
• In-place editing of files
• Comparison of cut-and-pasted text, as well as files on disk
• Unlimited undo
• Automatic intelligent merging of files and folders in a three-way comparison
• File comparison integrated with folder comparison
• Creation Standalone HTML and XML reports of file and folder comparisons
• Print/print-PREview
• Command-line interface
• Automation and plugin APIs
• Direct access to files and folders on FTP servers and Perforce/Visual SourceSafe repositories