DiffMerge banner
DiffMerge

Utility

DiffMerge Overview

A free diff/merge tool for Mac, Windows and Linux to visually compare and merge files. No frills, but does the job well.

Product Features
DiffMerge is an application to visually compare and merge files on Windows, OS X and Linux.

Diff screenshot
Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing.

Merge screenshot
Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file.

Folder Diff screenshot
Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical or different.

Configurable.
Rulesets and options provide for customized appearance and behavior.

Cross-platform.
Identical feature set on Windows, OS X, and Linux.


Stay on top of new tools for iOS developers

Subscribe to get a convenient weekly roundup of iOS Dev Tools' newest addition
of helpful and time-saving developer tools, services, and SDKs to get your job done faster.