KDiff3

Описание

KDiff3 is a free, open-source diff and merge program that can compare or merge two or three text input files or directories. It shows the differences line by line and character by character, providing a clear visual representation of changes. KDiff3 is known for its reliability and comprehensive merge capabilities.

Ключевые функции

• Two-way and three-way diff and merge
• Directory comparison and merge
• Full Unicode support for international text
• Syntax highlighting for many languages
• Automatic merge where possible
• Manual merge with intuitive interface
• Word-wrap and line numbers
• Integration with version control systems

Установка

# Linux (Ubuntu/Debian)
sudo apt install kdiff3

# Linux (Fedora)
sudo dnf install kdiff3

# macOS (Homebrew)
brew install --cask kdiff3

# Windows
# Download from https://kdiff3.sourceforge.net/

Использование

# Compare two files
kdiff3 file1.txt file2.txt

# Merge three files
kdiff3 file1.txt file2.txt file3.txt -o merged.txt

# Compare directories
kdiff3 dir1/ dir2/

# Use with Git
git config --global merge.tool kdiff3