Araxis Merge description
Merge is the visual file comparison/merging and folder synchronization application.

Merge is the visual file comparison/merging and folder synchronization application.

Merge lets you to compare and work with different revisions of text files, such as program source code, xml and html files. It supports files with ascii, mbcs and Unicode character encodings.

A colour-coded side-by-side comparison makes it easy to pinpoint at a glance similarities and differences between files. Linking lines are drawn between the documents showing clearly how they are related.

Point-and-click merging lets you choose the parts of each file that you would like to add to a final merged version by simply clicking buttons. The in-place editor with unlimited undo enables complete control over the merged file as you create it. The file comparison display dynamically updates as the merge progresses.

Merge shows detailed highlights of changes within lines. It can be configured to ignore differences in whitespace and line endings, as well as changes in lines matching specified regular expressions. The latter is useful for ignoring unimportant changes such as timestamps or expanded version control keywords.

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 and auditors: identify in context every change made between two or three source code hierarchies. Create a standalone html or xml report of your findings.

Other users: Whether you are working with multiple revisions of text files or need to keep multiple folder hierarchies in sync (for example, between a desktop and laptop machine), Merge could help save time and reduce errors by helping you to work quickly and accurately.

Limitations:

· 30 days trial