Meld

描述

Meld is a visual diff and merge tool that helps you compare files, directories, and version controlled projects. It provides a two-way and three-way comparison with color-coded differences, making it easy to understand changes at a glance. Meld is particularly popular among Linux users and integrates well with version control systems.

主要特性

• Visual two-way and three-way file comparison
• Directory comparison with file filtering
• Version control integration (Git, SVN, Mercurial, Bazaar)
• Auto-merge mode for conflict resolution
• Syntax highlighting for many programming languages
• File and directory comparison with filters
• Move detection for code refactoring
• Inline difference highlighting

安装

# Linux (Ubuntu/Debian)
sudo apt install meld

# Linux (Fedora)
sudo dnf install meld

# macOS (Homebrew)
brew install --cask meld

# Windows
# Download from https://meldmerge.org/

使用方法

# Compare two files
meld file1.txt file2.txt

# Compare three files
meld file1.txt file2.txt file3.txt

# Compare directories
meld dir1/ dir2/

# Use with Git
git config --global diff.tool meld
git difftool