Three-way file comparisons can be launched directly from a three-way folder comparison, allowing efficient integration of entire branches of source code.įolder hierarchy comparison and synchronization
The text comparison display dynamically updates as the merge progresses.Ĭompare text from common office file formatsĮxtract and compare the text content from Microsoft Office, OpenDocument, PDF and RTF files. The in-place editor with unlimited undo enables complete control over the merged file as you create it.
A colour-coded side-by-side comparison makes it easy to pinpoint at a glance similarities and differences between files.
The latter is useful for ignoring unimportant changes such as timestamps or expanded version control keywords. It can be configured to ignore differences in whitespace and line endings, as well as changes in lines matching specified regular expressions.
Create an HTML or XML report of changes for audit purposes. Compare product releases to be certain that only the expected files have been modified.
Synchronize a website with its staging area via FTP using the supplied FTP pluginįor release and quality control managers:Ĭompare different source code branches to give total confidence that you know and understand every change made to every file for a specific release. Use three-way comparison to integrate changes made by you, and those made by a colleague, with a common ancestor version. Work quickly and accurately, whether you are comparing individual files or reconciling entire branches of source code.
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.įor software engineers and web developers:Ĭompare, understand and combine different source file versions. Create a standalone HTML or XML report of your findings. Identify in context every change made between two or three source code hierarchies. Copy text from other applications (such as Microsoft Word) and paste it directly into a text comparison. Directly open and compare the text from Microsoft Office (Word and Excel), OpenDocument, PDF and RTF files. Instantly identify every change between different contract or manuscript drafts. Merge integrates with Time Machine, so you can compare older versions of files. 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., Pages or Microsoft Word). Araxis Merge is the two- and three-way visual file comparison/merging and folder synchronization application.