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.
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 NERFINISHED ⓘ |
| hasCommand |
ediff
NERFINISHED
ⓘ
ediff-buffers NERFINISHED ⓘ ediff-buffers3 ⓘ ediff-directories NERFINISHED ⓘ ediff-files ⓘ ediff-files3 ⓘ ediff-merge NERFINISHED ⓘ ediff-merge-buffers NERFINISHED ⓘ ediff-merge-files NERFINISHED ⓘ ediff-revision ⓘ |
| hasCustomizationGroup | ediff NERFINISHED ⓘ |
| 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 NERFINISHED ⓘ |
| introducedIn | early GNU Emacs 19 series ⓘ |
| license | GNU General Public License ⓘ |
| partOf | GNU Emacs NERFINISHED ⓘ |
| runsOn | GNU Emacs NERFINISHED ⓘ |
| 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 ⓘ |
Referenced by (1)
Full triples — surface form annotated when it differs from this entity's canonical label.