DiffMerge

Visual compare and merge tool. Two-way and three-way merge with folder diff support.

CommercialGUI
Windows, macOS, LinuxFree for personal use, $39/user for commercial use

Description

DiffMerge is a visual application for comparing and merging files on Windows, macOS, and Linux. It provides a clean interface for two-way and three-way diffs with folder comparison capabilities. DiffMerge is known for being straightforward and reliable.

Key Features

  • Graphical diff and merge interface
  • Two-way and three-way merge support
  • Folder diff with recursive comparison
  • Cross-platform (Windows, macOS, Linux)
  • Inline difference highlighting
  • Configurable external editor support
  • Command line interface available
  • Integration with version control

Installation

# Download from official website
# https://www.sourcegear.com/diffmerge/downloads/

# macOS (Homebrew)
brew install --cask diffmerge

Usage

# Compare two files
sgdm file1.txt file2.txt

# Merge with base file
sgdm file1.txt base.txt file2.txt -r merged.txt

# Compare directories
sgdm dir1/ dir2/

Pros

  • +Clean and simple interface
  • +Free for personal use
  • +Good three-way merge
  • +Cross-platform support
  • +Lightweight

Cons

  • -Commercial license needed for business use
  • -Less feature-rich than competitors
  • -Slow update cycle
  • -Limited customization options