Merge (revision Control) - Standalone Merging Tools

Standalone Merging Tools

• Araxis Merge 2/3-way file comparison, merging and folder synchronization for Windows and Mac OS X (http://www.araxis.com/)
• Beyond Compare Professional Folder and file comparison/synchronization and 3-way merge utility for Windows and Linux (http://www.scootersoftware.com/)
• Compare++ Smart code diff utility for Windows, can do structured comparison and merge for C/C++, Java, C#, Javascript, CSS, ...(http://www.coodesoft.com/)
• DeltaWalker Oro Two and three-way file & folder comparison, merge and synchronization for Mac OS X, Windows, and Linux (http://www.deltopia.com/)
• DiffMerge (http://www.sourcegear.com/diffmerge/index.html) file and folder compare and merge (also supports three way merge) for Mac OS X, Windows and Linux.
• ECMerge 2-way and 3-way diff/merge tool for text, images and directories (http://www.elliecomputing.com)
• ExamDiff_Pro compare directories, binary files and text files (http://www.prestosoft.com/edp_examdiffpro.asp)
• Apple FileMerge, a Mac OS X development tool derived from Merge from NeXT
• Guiffy SureMerge File Compare, Folder Compare, and Merge tool (http://www.guiffy.com)
• diff3 3-way merge tool, widely spread on Unix-like systems
• KDiff3 3-way merge tool (http://kdiff3.sourceforge.net)
• medini unite 3-way diff and merge tool for Matlab Simulink and Stateflow models (http://www.ikv.de)
• meld
• MergePlant 3-way merge tool (http://www.mikado-ltd.com)
• SimMerge 3-way merge tool for Simulink models. (http://www.ensoftcorp.com/SimMerge/)
• tkmerge
• TortoiseMerge a free, open source graphic windows based 3-way diff and merge tool
• WinMerge a free, open source graphic windows based diff and merge tool
• UltraCompare (http://www.ultraedit.com/products/ultracompare.html)
• xxdiff - Graphical File And Directories Comparator And Merge Tool

Other merge tools are cited in diff.