Beyond Compare allows you to compare files and folders. By using simple, powerful commands you can focus on the differences you're interested in and ignore those you're not. You can then merge the changes, synchronize your files, and generate reports for your records.
You can compare entire drives and folders at high speed, checking just sizes and modified times. Or, thoroughly verify every file with byte-by-byte comparisons. FTP sites and zip files are integrated seamlessly, so you can update your website with the touch of a button.
↧
Beyond Compare
↧
DiffMerge
DiffMerge is a graphical file comparison program for Windows, Mac OS X and Unix, published by SourceGear.
* Integrates with Windows Explorer; adds a shortcut to the context menu.
* Compatible with different character encodings, including Unicode support.
* Performs a side-by-side comparison of two folders.
* Supports comparison of three files.
↧
↧
Meld
Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. Written with Python and GTK.
For Mac see http://fink.thetis.ig42.org/ or http://www.macports.org/
For Windows see https://live.gnome.org/Meld/Windows or https://code.google.com/p/meld-installer/
Requirements:
Python 2.6
GTK+/pygtk 2.14
GLib/pygobject 2.16
GtkSourceView/pygtksourceview 2.10 (optional)
↧
kdiff3
KDiff3 is a file and directory diff and merge tool which compares and merges two or three text input files or directories, shows the differences line by line and character by character, provides an automatic merge-facility, has an editor for comfortable solving of merge-conflicts, provides networktransparency via KIO, has options to highlight or hide changes in white-space or comments, supports Unicode, UTF-8 and other file encodings, prints differences, supports version control keyword and history merging.
↧
Araxis Merge
Merge is the visual file comparison (diff), merging and folder synchronization application from Araxis. Use it to compare and merge source code, web pages, XML and other text files with native application performance. Directly open and compare the text from Microsoft Office (Word and Excel), OpenDocument, PDF and RTF files. Compare images and binary files. Synchronize folders. Perform code reviews and audits. Work with folder hierarchies containing thousands of files. Merge integrates with many SCM (version control) systems and other applications.
Merge is available for Mac OS X and Windows. One licence entitles you to use Merge on both platforms. Merge for Mac OS X is fully localized into English and Japanese. The Windows version offers a user interface in English, French, German, Japanese. This link is to an external website and International Spanish, with the online help in English and Japanese.
↧
↧
Changes
Changes is a powerful application for comparing folders and the files they contain. Anyone who needs to see the differences between folders or files - particularly software and web developers - will find Changes useful.
Changes is built using the latest technologies in Mac OS X Leopard and integrates with several popular Mac applications:
↧
ViceVersa
ViceVersa does File Synchronization, File Replication, File Backup and File Comparison. It can automatically verify data using a CRC32 checksum.
ViceVersa lets you synchronize files, replicate folders, perform backups and do file and folder comparisons like never before: innovative, fast and time-saving.
ViceVersa works between computers, e.g. Laptop, Desktop, Workstation, Server, over network LAN, WAN, VPN, USB, and with any type of storage media including external Hard Disk, Zip disk, USB flash drive, CD-RW, DVD, NAS (Network Attached Storage).
ViceVersa unique side-by-side view quickly shows you the latest status of your files and gives you complete control over your data.
You get easy file backup software with flexible file archiving, bi-directional file sync software, automatic file and folder replication (=file mirroring), CRC file comparison and file verification to make sure your replica is still the same.
ViceVersa can copy open files without closing the program you are working on. This includes Outlook PST files, Outlook Express, QuickBooks databases, Word and Excel documents, SQL databases.
With compression and encryption, time synchronization, file archiving, file revision and versioning, ViceVersa delivers the flexibility you need to keep your data safe and protected.
↧
Kompare
KDE GUI for diff. Kompare allows the user to view the differences between two text files, merge these and recursively compare directories.
↧
ExamDiff Pro
ExamDiff Pro is a powerful, intuitive, and easy to use visual side-by-side comparison tool for comparing and merging text and binary files, and directories.
↧
↧
FileSync
File/folder synchronization utility for keeping files up to date.
↧
DeltaWalker
The Deltopia website, home of DeltaWalker - the intuitive,
multi-platform application for two and three-way visual file and folder comparison.
Use DeltaWalker to compare (diff) and merge files and to compare and synchronize folders.
↧
P4Merge
The Perforce Merge Tool, P4Merge, provides graphical three-way merging and side-by-side file comparisons.
P4Merge allows users to visualize the differences between file versions. P4Merge uses color coding to simplify the process of resolving conflicts that result from parallel or concurrent development.
* Text files differences can be highlighted and edited
* Includes or ignores line ending or whitespace differences
* Supports Windows (CRLF), Mac (CR), and Unix (LF) line ending conventions
* Accepts command-line parameters and can be used from non-Peforce applications
* Displays line numbers when comparing and merging files
↧
Compare It!
Easily compare and merge text files; compare doc, xls and pdf files; prepare comparison reports and printouts.
↧
↧
Diff Checker
diffChecker is a free online diff tool that quickly and easily gives you the text differences between two files.
↧
Text compare!
Text compare! is a online diff tool that allows you to easily spot the differences between to texts. Just paste two texts and hit the compare button. The two texts are shown side by side, with differences highlighted. It highlights not the entire line which contains a difference, but only the difference itself. For larger texts, it also has links that allow you to jump from one difference to the next.
↧
Tkdiff
tkdiff is a graphical diff viewer based on the Tk framework. It is capable of inter-operating with source-control systems like CVS and Subversion to show differences between a local copy and a repository version.
It provides a side-by-side view of the differences between two files, along with several innovative features such as diff bookmarks and a graphical map of differences for quick navigation.
↧
ECMerge
ECMerge is a comparison and synchronization tool with two and three-way merge for text and folders and difference on binary, text, images and folders, locally, via FTP/S, SFTP or in version controls. For Windows, Mac OS X, Solaris and Linux.
It includes Xtract to let you compare Microsoft Word, OpenOffice Writer and RTF files.
↧
↧
Diffuse
Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code.
Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line-matching and directly edit files. Diffuse can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories for comparison and merging.
↧
Kaleidoscope
Use Kaleidoscope to spot the differences in text and image files. Review changes in seconds with the worlds most advanced file comparison application.
↧
xxdiff
xxdiff is a QT based graphical file and directories comparator and merge tool. It provides comparing two files, three files.
↧