Diff Terminal Tools
diff is a command-line utility, first developed by Douglas McIlroy in the early 1970s as part of the Unix operating system, for comparing two files line by line.
It has become essential in various computing tasks, particularly in software development for identifying changes between different versions of the same file.
The main use cases of diff include code review, patch creation, and merging in version control systems.
Below is a list of terminal tools that work with and are inspired by diff.
asmdiff
A tool to compare per-function C assembly across compilers and revisions.
A tool to compare per-function C assembly across compilers and revisions.
critique
A terminal UI for reviewing git diffs.
A terminal UI for reviewing git diffs.
daff
align and compare tables
align and compare tables
delta
A viewer for git and diff output.
A viewer for git and diff output.
diffnav
A git diff pager based on delta but with a file tree, à la GitHub.
A git diff pager based on delta but with a file tree, à la GitHub.
difftastic
A structural diff that understands syntax.
A structural diff that understands syntax.
diffyml
A fast, structural YAML diff tool with built-in Kubernetes intelligence.
A fast, structural YAML diff tool with built-in Kubernetes intelligence.
drft
A diff re/viewer and file tree viewer.
A diff re/viewer and file tree viewer.
dunk
Prettier git diffs in the terminal 🎨
Prettier git diffs in the terminal 🎨
dyff
diff tool for YAML files, and sometimes JSON.
diff tool for YAML files, and sometimes JSON.
ec
An easy terminal native 3-way git conflict resolver.
An easy terminal native 3-way git conflict resolver.
envdiff
A CLI tool to snapshot and diff environments.
A CLI tool to snapshot and diff environments.
ftdv
File Tree Diff Viewer.
File Tree Diff Viewer.
git-split-diffs
Syntax highlighted side-by-side diffs in your terminal
Syntax highlighted side-by-side diffs in your terminal
hunk
A review-first terminal diff viewer.
A review-first terminal diff viewer.
livediff
Watch file diffs live in your terminal.
Watch file diffs live in your terminal.
mergiraf
A syntax-aware Git merge conflict resolver.
A syntax-aware Git merge conflict resolver.
oyo
A step-through diff viewer.
A step-through diff viewer.
oyui
A modern merge editor for jujutsu and git.
A modern merge editor for jujutsu and git.
riff
A diff filter highlighting which line parts have changed.
A diff filter highlighting which line parts have changed.
Know any terminal tools that would be good for this list? Submit a Tool here!