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... Free Open Source Mac OS X Windows Linux BSD Python Folder Comparison Real Time Comparison Compare Source Code Syntax Highlighting Add a feature 295 Like
Beyond Compare 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... Commercial Mac OS X Windows Linux Folder Comparison Windows Explorer integration File-sync Support for FTP ... Support for SFTP Version and Source control Add a feature 251 Like
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... Free Open Source Mac Windows Linux Folder Comparison Version and Source control Add a feature 91 Like Discontinued Latest release 0.9.98 in 2014-07-08
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... Free Open Source Mac OS X Windows Linux Side-by-Side comparison Add a feature 19 Like
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... Free Mac OS X Windows Linux Configurable Windows Explorer integration Merge files Folder Comparison ... Side-by-Side comparison Support for Unicode Add a feature 36 Like Discontinued No releases since October 2013: latest version, 4.2.0, can be still downloaded from the official website.
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... Commercial Mac OS X Windows Folder Comparison Add a feature 33 Like
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... Free Mac OS X Windows Linux Side-by-Side comparison Add a feature 20 Like
FileMerge FileMerge lets you compare one file to another or one directory to another and merge the files or directories together. Free Mac OS X Xcode Compare texts analysis Merge files Add a feature 9 Like
Kaleidoscope Use Kaleidoscope to spot the differences in text and image files. Review changes in seconds with the worlds most advanced file comparison application. Commercial Mac OS X No features added Add a feature 18 Like
SmartSynchronize SmartSynchronize is a multi-platform file and directory compare tool. It allows you to compare files or perform 3-way-merges, both with the ability to edit the file... Free Personal Mac OS X Windows Linux Merge files Add a feature 13 Like
DeltaWalker 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... Commercial Mac OS X Windows Linux File-sync Folder Comparison Add a feature 11 Like
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... Free Open Source Mac OS X Windows Linux BSD Cygwin No features added Add a feature 6 Like
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... Commercial Mac OS X No features added Add a feature 4 Like
DiffFork DiffFork is a diff tool for Mac OS X. DiffFork can compare both folders and files, presenting differences in a visual format. * Block Guide and Scrolling in Sync. *... Commercial Mac OS X Merge files Folder Comparison Add a feature 2 Like Discontinued The program is no longer updated. Last version, 1.1.9.2, released in 2012, can be still downloaded from the official website.
Meld - Mac Port This is actually Meld itself ported to Mac. Doesn't require X and keybinding changed to be adapt Mac shortcuts. Free Open Source Mac OS X No features added Add a feature 4 Like
