RustNatively renderedmacOS / Windows / Linux
Compare and mergeanything.
Folders, text, tables, hex, pictures, documents, media and the registry — fifteen kinds of session in one native app.
Free to use. No account needed.
Folders: compare, synchronise, merge
The rules decide; the verdict is one glance away.
Compare by size, time, checksum or byte for byte; filter, flatten, and jump to the next difference with F7. Copying, moving, renaming and deleting run in the background, can be paused and cancelled, and deletions go to the Trash. Five ways to synchronise, each previewed before it runs, and two- and three-way folder merges that hand you a plan you can edit.
Text: edit both sides, recompared as you type
Both sides are editable and the comparison is redone as you type. Important and unimportant differences are coloured apart, and the rules are yours: case, whitespace, comments, replacements, alignment by grammar. Side by side, over-under or unified, with connectors, bookmarks, manual alignment and find and replace.
Three-way merge and patches
A three-way merge with an output pane of its own and conflict-by-conflict navigation, opened straight from `git mergetool`; two-way merges work the same way. Patch files are shown side by side, and a patch can be applied to a working copy.
More than text
Tables and Excel (several worksheets, key columns, tolerances, column mapping), hex (editable, aligned, with a value bar), pictures (side by side, overlay, swipe, difference, blink, and a pixel magnifier), PDF, Word, RTF and HTML compared as text, media tags, executable version information, and the registry.
Wherever the files are
Archives open as folders, and zip, tar, tar.gz and 7z are written back in place (with a .bak kept first). SFTP, FTP/FTPS, S3, WebDAV and SVN folders are compared where they are, with resumable transfers. Any revision in Git, a file system snapshot and the clipboard are sources too.
Automation and integration
The scripting language turns a comparison, a synchronisation and a report into one command, and Beyond Compare scripts can be imported. The command line always returns a meaningful exit code. Reports come as HTML, text, a patch, XML or CSV statistics. difftool and mergetool, the file manager context menu, Subversion, Mercurial and Perforce are each one click to configure.
Try it on the two folders you have been putting off.
Folders, text, tables, hex, pictures, documents, media and the registry — fifteen kinds of session in one native app.
Download