Apps with '3 way merge' feature

Share Tweet Post

Meld
Free • Open Source
Diff Tool
File Comparison Tool
Folder Comparison Tool
Mac
Windows
Linux
BSD
Python
45 Meld alternatives
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...
Suggest and vote on features
Meld Features
1. Syntax HighlightingMeld supports syntax highlighting for various programming and markup languages.
2. Ad-freeMeld doesn't contain any form of external advertising.
3. Works OfflineMeld can be used without the need to connect to the internet.
4. No registration requiredYou can use most of the features in Meld without registration.
Compare Source Code
Comparing folders
3 way merge
Real Time Comparison
One-click merging
Top 3 alternatives
Sourcetree
Free • Proprietary
Git Client
Version Control System
Mac
Windows
63 Sourcetree alternatives
A powerful Mac and Windows client for Mercurial and Git distributed version control systems.
Suggest and vote on features
Sourcetree Features
1. Git SupportSourcetree supports Git, a free and open source distributed version control system.
2. File VersioningSourcetree has a version system that lets you view and go back to older versions of the project/file/document.
3. Dark ModeSourcetree supports dark mode for comfortable usage in low light conditions.
Git-flow integration
Works with public and private repos
Merge code
3 way merge
Bitbucket Integration
GitHub integration
Hg hosting
Top 3 alternatives
KDiff3
Free • Open Source
Diff Tool
File Comparison Tool
Folder Comparison Tool
Mac
Windows
Linux
49 KDiff3 alternatives
KDiff3 is a file and directory diff and merge tool.
Suggest and vote on features
KDiff3 Features
3 way merge
Side-by-Side Comparison
Text Wrapping
Top 3 alternatives
Diffuse Merge Tool
Free • Open Source
Diff Tool
File Comparison Tool
Mac
Windows
Linux
47 Diffuse Merge Tool alternatives
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.
Suggest and vote on features
Diffuse Merge Tool Features
1. LightweightDiffuse Merge Tool consumes less device resources compared to similar apps.
Side-by-Side Comparison
Fast file and folder search
3 way merge
Top 3 alternatives
SmartSynchronize
Paid • Proprietary
Diff Tool
File Comparison Tool
Merge File Tool
Mac
Windows
Linux
41 SmartSynchronize alternatives
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)...
Suggest and vote on features
SmartSynchronize Features
3 way merge
Top 3 alternatives

Meld

Meld Features

Top 3 alternatives

Sourcetree

Sourcetree Features

Top 3 alternatives

KDiff3

KDiff3 Features

Top 3 alternatives

Diffuse Merge Tool

Diffuse Merge Tool Features

Top 3 alternatives

SmartSynchronize

SmartSynchronize Features

Top 3 alternatives