Emacs ediff

E1008122

Emacs ediff is a built-in Emacs tool for interactively comparing and merging files and buffers with a visual, side-by-side interface.

All labels observed (7)

Label Occurrences
ediff 2
Emacs ediff canonical 1
ediff-buffers 1

How this entity was disambiguated

Statements (51)

Predicate Object
instanceOf Emacs feature
merge tool
visual diff tool
defaultKeyBinding none (invoked by M-x ediff-*)
documentationNode (info "ediff")
hasAuthor Michael Kifer
hasCommand ediff
linked to: Emacs ediff

ediff-buffers
linked to: Emacs ediff

ediff-buffers3
ediff-directories
linked to: Emacs ediff

ediff-files
ediff-files3
ediff-merge
linked to: Emacs ediff

ediff-merge-buffers
linked to: Emacs ediff

ediff-merge-files
linked to: Emacs ediff

ediff-revision
hasCustomizationGroup ediff
linked to: Emacs ediff
hasFeature ability to ignore case differences
ability to ignore whitespace changes
customizable diff options
highlighted differences
hooks for customization
integration with VC mode
keyboard-driven navigation
narrowing to specific differences
refinement of diffs
saving merged output to file
session control buffer
session restoration after quitting
side-by-side display
support for comparing directories recursively
support for external diff programs
support for remote files via TRAMP
undo support in merge buffers
window layout control
word-level diff refinement
implementedIn Emacs Lisp
introducedIn early GNU Emacs 19 series
license GNU General Public License
partOf GNU Emacs
runsOn GNU Emacs
supportsOperation buffer comparison
directory comparison
file comparison
patch application
region comparison
three-way merge
two-way diff
version control diff viewing
window configuration restoration
usesAlgorithm diff

How these facts were elicited

Referenced by (8)

Full triples — surface form annotated when it differs from this entity's canonical label.

Magit integratesWith Emacs ediff
Emacs ediff hasCommand ediff
linked to: Emacs ediff
Emacs ediff hasCommand ediff-buffers
linked to: Emacs ediff
Emacs ediff hasCommand ediff-directories
linked to: Emacs ediff
Emacs ediff hasCommand ediff-merge
linked to: Emacs ediff
Emacs ediff hasCommand ediff-merge-files
linked to: Emacs ediff
Emacs ediff hasCommand ediff-merge-buffers
linked to: Emacs ediff
Emacs ediff hasCustomizationGroup ediff
linked to: Emacs ediff