Apps with '3 way merge' feature

Open-source tool for dynamic file and folder comparisions, syntax highlighting, offline functionality, and version control integration.

A powerful Mac and Windows client for Mercurial and Git distributed version control systems.

KDiff3 is a file and directory diff and merge tool.

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.

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 contents. SmartSynchronize is specialized in comparing directory structures (for example, of software projects)...