External diff tool guide

KDiff3

KDE diff and merge application for comparing or merging two or three files and directories with visual conflict resolution.

Category
Desktop GUI
License
Open source
Platforms
Windows, Linux, macOS

Best for

Open-source desktop merge workflows, especially when three-way merge and directory comparison matter more than visual polish.

Strengths

  • Strong three-way merge
  • Free and open source
  • Directory comparison support

Limitations

  • Interface can feel utilitarian
  • Media comparison is limited
  • Setup varies by platform

Key features

Two-way and three-way comparison
Directory merge
Manual conflict resolution
Version control integration

Install notes

Linux: install kdiff3 from your package manager.macOS: brew install --cask kdiff3Windows: use KDE release installers.