This is ../info/ediff, produced by makeinfo version 4.5 from ediff.texi. This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover texts being "A GNU Manual", and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled "GNU Free Documentation License" in the Emacs manual. (a) The FSF's Back-Cover Text is: "You have freedom to copy and modify this GNU Manual, like GNU software. Copies published by the Free Software Foundation raise funds for GNU development." This document is part of a collection distributed under the GNU Free Documentation License. If you want to distribute this document separately from the collection, you can do so by adding a copy of the license to the document, as described in section 6 of the license. INFO-DIR-SECTION Emacs START-INFO-DIR-ENTRY * Ediff: (ediff). A visual interface for comparing and merging programs. END-INFO-DIR-ENTRY  File: ediff, Node: Credits, Next: Index, Prev: Customization, Up: Top Credits ******* Ediff was written by Michael Kifer . It was inspired by emerge.el written by Dale R. Worley . An idea due to Boris Goldowsky made it possible to highlight fine differences in Ediff buffers. Alastair Burt ported Ediff to XEmacs, Eric Freudenthal made it work with VC, Marc Paquette wrote the toolbar support package for Ediff, and Hrvoje Niksic adapted it to the Emacs customization package. Many people provided help with bug reports, feature suggestions, and advice. Without them, Ediff would not be nearly as useful as it is today. Here is a hopefully full list of contributors: Adrian Aichner (aichner@ecf.teradyne.com), Steve Baur (steve@xemacs.org), Neal Becker (neal@ctd.comsat.com), E. Jay Berkenbilt (ejb@ql.org), Alastair Burt (burt@dfki.uni-kl.de), Paul Bibilo (peb@delcam.co.uk), Kevin Broadey (KevinB@bartley.demon.co.uk), Harald Boegeholz (hwb@machnix.mathematik.uni-stuttgart.de), Bradley A. Bosch (brad@lachman.com), Michael D. Carney (carney@ltx-tr.com), Jin S. Choi (jin@atype.com), Scott Cummings (cummings@adc.com), Albert Dvornik (bert@mit.edu), Eric Eide (eeide@asylum.cs.utah.edu), Paul Eggert (eggert@twinsun.com), Urban Engberg (ue@cci.dk), Kevin Esler (esler@ch.hp.com), Robert Estes (estes@ece.ucdavis.edu), Jay Finger (jayf@microsoft.com), Xavier Fornari (xavier@europe.cma.fr), Eric Freudenthal (freudent@jan.ultra.nyu.edu), Job Ganzevoort (Job.Ganzevoort@cwi.nl), Felix Heinrich Gatzemeier (felix.g@tzemeier.info), Boris Goldowsky (boris@cs.rochester.edu), Allan Gottlieb (gottlieb@allan.ultra.nyu.edu), Aaron Gross (aaron@bfr.co.il), Thorbjoern Hansen (thorbjoern.hansen@mchp.siemens.de), Marcus Harnisch (marcus_harnisch@mint-tech.com), Steven E. Harris (seh@panix.com), Xiaoli Huang (hxl@epic.com), Andreas Jaeger (aj@suse.de), Lars Magne Ingebrigtsen (larsi@ifi.uio.no), Larry Gouge (larry@itginc.com), Karl Heuer (kwzh@gnu.org), (irvine@lks.csi.com), (jaffe@chipmunk.cita.utoronto.ca), David Karr (dkarr@nmo.gtegsc.com), Norbert Kiesel (norbert@i3.informatik.rwth-aachen.de), Leigh L Klotz (klotz@adoc.xerox.com), Fritz Knabe (Fritz.Knabe@ecrc.de), Heinz Knutzen (hk@informatik.uni-kiel.d400.de), Andrew Koenig (ark@research.att.com), Hannu Koivisto (azure@iki.fi), Ken Laprade (laprade@dw3f.ess.harris.com), Will C Lauer (wcl@cadre.com), Richard Levitte (levitte@e.kth.se), Mike Long (mike.long@analog.com), Dave Love (d.love@dl.ac.uk), Martin Maechler (maechler@stat.math.ethz.ch), Simon Marshall (simon@gnu.org), Paul C. Meuse (pmeuse@delcomsys.com), Richard Mlynarik (mly@adoc.xerox.com), Stefan Monnier (monnier@cs.yale.edu), Chris Murphy (murphycm@sun.aston.ac.uk), Erik Naggum (erik@naggum.no), Eyvind Ness (Eyvind.Ness@hrp.no), Ray Nickson (nickson@cs.uq.oz.au), Dan Nicolaescu (dann@ics.uci.edu), David Petchey (petchey_david@jpmorgan.com), Benjamin Pierce (benjamin.pierce@cl.cam.ac.uk), Francois Pinard (pinard@iro.umontreal.ca), Tibor Polgar (tlp00@spg.amdahl.com), David Prince (dave0d@fegs.co.uk), Paul Raines (raines@slac.stanford.edu), Stefan Reicher (xsteve@riic.at), Charles Rich (rich@merl.com), Bill Richter (richter@math.nwu.edu), C.S. Roberson (roberson@aur.alcatel.com), Kevin Rodgers (kevin.rodgers@ihs.com), Sandy Rutherford (sandy@ibm550.sissa.it), Heribert Schuetz (schuetz@ecrc.de), Andy Scott (ascott@pcocd2.intel.com), Axel Seibert (axel@tumbolia.ppp.informatik.uni-muenchen.de), Vin Shelton (acs@xemacs.org), Scott O. Sherman (Scott.Sherman@mci.com), Richard Stallman (rms@gnu.org), Richard Stanton (stanton@haas.berkeley.edu), Sam Steingold (sds@goems.com), Ake Stenhoff (etxaksf@aom.ericsson.se), Stig (stig@hackvan.com), Peter Stout (Peter_Stout@cs.cmu.edu), Chuck Thompson (cthomp@cs.uiuc.edu), Ray Tomlinson (tomlinso@bbn.com), Raymond Toy (toy@rtp.ericsson.se), Stephen J. Turnbull (stephen@xemacs.org), Jan Vroonhof (vroonhof@math.ethz.ch), Colin Walters (walters@cis.ohio-state.edu), Philippe Waroquiers (philippe.waroquiers@eurocontrol.be), Klaus Weber (gizmo@zork.north.de), Ben Wing (ben@xemacs.org), Tom Wurgler (twurgler@goodyear.com), Steve Youngs (youngs@xemacs.org), Ilya Zakharevich (ilya@math.ohio-state.edu), Eli Zaretskii (eliz@is.elta.co.il)  File: ediff, Node: Index, Prev: Credits, Up: Top Index ***** * Menu: * !: Quick Help Commands. * ##: Quick Help Commands. * #f: Quick Help Commands. * #h: Quick Help Commands. * $$: Quick Help Commands. * $*: Quick Help Commands. * %: Quick Help Commands. * &: Quick Help Commands. * *: Quick Help Commands. * +: Quick Help Commands. * /: Quick Help Commands. * <: Quick Help Commands. * =: Quick Help Commands. * >: Quick Help Commands. * ?: Quick Help Commands. * @: Quick Help Commands. * A: Quick Help Commands. * a: Quick Help Commands. * ab: Quick Help Commands. * ac: Quick Help Commands. * B: Quick Help Commands. * b: Quick Help Commands. * ba: Quick Help Commands. * bc: Quick Help Commands. * C: Quick Help Commands. * C-l: Quick Help Commands. * ca: Quick Help Commands. * cb: Quick Help Commands. * Comparing files and buffers: Introduction. * D: Quick Help Commands. * DEL: Quick Help Commands. * Directory difference buffer: Session Groups. * E: Quick Help Commands. * ediff: Major Entry Points. * ediff-after-flag-eol: Highlighting Difference Regions. * ediff-after-flag-mol: Highlighting Difference Regions. * ediff-after-session-group-setup-hook: Hooks. * ediff-after-setup-control-frame-hook: Hooks. * ediff-after-setup-windows-hook: Hooks. * ediff-auto-refine: Refinement of Difference Regions. * ediff-auto-refine-limit: Refinement of Difference Regions. * ediff-autostore-merges <1>: Merging and diff3. * ediff-autostore-merges <2>: Hooks. * ediff-autostore-merges: Session Groups. * ediff-backup: Major Entry Points. * ediff-before-flag-bol: Highlighting Difference Regions. * ediff-before-flag-mol: Highlighting Difference Regions. * ediff-before-session-group-setup-hook: Hooks. * ediff-before-setup-control-frame-hook: Hooks. * ediff-before-setup-hook: Hooks. * ediff-before-setup-windows-hook: Hooks. * ediff-brief-help-message-function: Notes on Heavy-duty Customization. * ediff-buffers: Major Entry Points. * ediff-buffers3: Major Entry Points. * ediff-cleanup-hook: Hooks. * ediff-coding-system-for-read: Patch and Diff Programs. * ediff-combination-pattern: Merging and diff3. * ediff-control-buffer: Quick Help Customization. * ediff-control-frame-parameters: Window and Frame Configuration. * ediff-control-frame-position-function: Window and Frame Configuration. * ediff-control-frame-upward-shift: Window and Frame Configuration. * ediff-current-diff-face-A: Highlighting Difference Regions. * ediff-current-diff-face-B: Highlighting Difference Regions. * ediff-current-diff-face-C: Highlighting Difference Regions. * ediff-custom-diff-options: Patch and Diff Programs. * ediff-custom-diff-program: Patch and Diff Programs. * ediff-default-variant: Merging and diff3. * ediff-diff-options: Patch and Diff Programs. * ediff-diff-program <1>: Patch and Diff Programs. * ediff-diff-program: Refinement of Difference Regions. * ediff-diff3-options: Patch and Diff Programs. * ediff-diff3-program: Patch and Diff Programs. * ediff-directories: Major Entry Points. * ediff-directories3: Major Entry Points. * ediff-directory-revisions: Major Entry Points. * ediff-display-help-hook: Hooks. * ediff-documentation: Major Entry Points. * ediff-even-diff-face-A: Highlighting Difference Regions. * ediff-even-diff-face-B: Highlighting Difference Regions. * ediff-even-diff-face-C: Highlighting Difference Regions. * ediff-files: Major Entry Points. * ediff-files3: Major Entry Points. * ediff-fine-diff-face-A: Highlighting Difference Regions. * ediff-fine-diff-face-B: Highlighting Difference Regions. * ediff-fine-diff-face-C: Highlighting Difference Regions. * ediff-force-faces: Highlighting Difference Regions. * ediff-forward-word: Refinement of Difference Regions. * ediff-forward-word-function: Refinement of Difference Regions. * ediff-grab-mouse: Miscellaneous. * ediff-help-message: Quick Help Customization. * ediff-highlight-all-diffs: Highlighting Difference Regions. * ediff-ignore-similar-regions: Selective Browsing. * ediff-janitor: Hooks. * ediff-job-name: Notes on Heavy-duty Customization. * ediff-keep-variants: Miscellaneous. * ediff-keymap-setup-hook: Hooks. * ediff-load-hook: Hooks. * ediff-long-help-message-function: Notes on Heavy-duty Customization. * ediff-make-buffers-readonly-at-startup: Miscellaneous. * ediff-make-frame-position: Window and Frame Configuration. * ediff-make-wide-display-function: Miscellaneous. * ediff-maybe-save-and-delete-merge <1>: Merging and diff3. * ediff-maybe-save-and-delete-merge: Hooks. * ediff-merge: Major Entry Points. * ediff-merge-buffers: Major Entry Points. * ediff-merge-buffers-with-ancestor: Major Entry Points. * ediff-merge-directories: Major Entry Points. * ediff-merge-directories-with-ancestor: Major Entry Points. * ediff-merge-directory-revisions: Major Entry Points. * ediff-merge-directory-revisions-with-ancestor: Major Entry Points. * ediff-merge-filename-prefix: Merging and diff3. * ediff-merge-files: Major Entry Points. * ediff-merge-files-with-ancestor: Major Entry Points. * ediff-merge-revisions: Major Entry Points. * ediff-merge-revisions-with-ancestor: Major Entry Points. * ediff-merge-split-window-function: Miscellaneous. * ediff-merge-window-share: Merging and diff3. * ediff-merge-with-ancestor: Major Entry Points. * ediff-meta-buffer-keymap-setup-hook: Hooks. * ediff-meta-buffer-map: Hooks. * ediff-mode-hook: Hooks. * ediff-mode-map: Hooks. * ediff-narrow-control-frame-leftward-shift: Window and Frame Configuration. * ediff-no-emacs-help-in-control-buffer: Miscellaneous. * ediff-odd-diff-face-A: Highlighting Difference Regions. * ediff-odd-diff-face-B: Highlighting Difference Regions. * ediff-odd-diff-face-C: Highlighting Difference Regions. * ediff-patch-buffer: Major Entry Points. * ediff-patch-default-directory: Patch and Diff Programs. * ediff-patch-file: Major Entry Points. * ediff-patch-options: Patch and Diff Programs. * ediff-patch-program: Patch and Diff Programs. * ediff-prefer-iconified-control-frame: Window and Frame Configuration. * ediff-prepare-buffer-hook <1>: Customizing the Mode Line. * ediff-prepare-buffer-hook: Hooks. * ediff-profile: Other Session Commands. * ediff-quit-hook: Hooks. * ediff-quit-merge-hook <1>: Merging and diff3. * ediff-quit-merge-hook: Hooks. * ediff-quit-session-group-hook: Hooks. * ediff-quit-widened: Narrowing. * ediff-regions-linewise: Major Entry Points. * ediff-regions-wordwise: Major Entry Points. * ediff-registry-setup-hook: Hooks. * ediff-revert-buffers-then-recompute-diffs: Other Session Commands. * ediff-revision: Major Entry Points. * ediff-save-buffer: Patch and Diff Programs. * ediff-select-hook: Hooks. * ediff-setup: Notes on Heavy-duty Customization. * ediff-setup-windows: Window and Frame Configuration. * ediff-setup-windows-multiframe: Window and Frame Configuration. * ediff-setup-windows-plain: Window and Frame Configuration. * ediff-show-clashes-only: Merging and diff3. * ediff-show-registry: Other Session Commands. * ediff-split-window-function: Miscellaneous. * ediff-start-narrowed: Narrowing. * ediff-startup-hook <1>: Notes on Heavy-duty Customization. * ediff-startup-hook <2>: Quick Help Customization. * ediff-startup-hook: Hooks. * ediff-suspend-hook: Hooks. * ediff-toggle-multiframe <1>: Window and Frame Configuration. * ediff-toggle-multiframe: Other Session Commands. * ediff-toggle-read-only-function: Miscellaneous. * ediff-toggle-use-toolbar: Other Session Commands. * ediff-unselect-hook: Hooks. * ediff-use-last-dir <1>: Miscellaneous. * ediff-use-last-dir: Major Entry Points. * ediff-use-long-help-message: Quick Help Customization. * ediff-use-toolbar-p: Other Session Commands. * ediff-version-control-package: Support for Version Control. * ediff-wide-control-frame-rightward-shift: Window and Frame Configuration. * ediff-window-setup-function: Window and Frame Configuration. * ediff-windows-linewise: Major Entry Points. * ediff-windows-wordwise: Major Entry Points. * ediff-word-1: Refinement of Difference Regions. * ediff-word-2: Refinement of Difference Regions. * ediff-word-3: Refinement of Difference Regions. * ediff-word-4: Refinement of Difference Regions. * ediff-word-mode: Notes on Heavy-duty Customization. * ediff3: Major Entry Points. * edir-merge-revisions: Major Entry Points. * edir-merge-revisions-with-ancestor: Major Entry Points. * edir-revisions: Major Entry Points. * edirs: Major Entry Points. * edirs-merge: Major Entry Points. * edirs-merge-with-ancestor: Major Entry Points. * edirs3: Major Entry Points. * epatch: Major Entry Points. * epatch-buffer: Major Entry Points. * eregistry: Other Session Commands. * Finding differences: Introduction. * G: Quick Help Commands. * ga: Quick Help Commands. * gb: Quick Help Commands. * gc: Quick Help Commands. * generic-sc.el: Support for Version Control. * h: Quick Help Commands. * i: Quick Help Commands. * j: Quick Help Commands. * M: Quick Help Commands. * m: Quick Help Commands. * Merging files and buffers: Introduction. * mode-line.el: Customizing the Mode Line. * Multi-file patches: Session Groups. * n: Quick Help Commands. * p: Quick Help Commands. * Patching files and buffers: Introduction. * pcl-cvs.el: Support for Version Control. * q: Quick Help Commands. * R: Quick Help Commands. * r: Quick Help Commands. * ra: Quick Help Commands. * rb: Quick Help Commands. * rc: Quick Help Commands. * rcs.el: Support for Version Control. * s: Quick Help Commands. * SPC: Quick Help Commands. * uniquify.el: Customizing the Mode Line. * V: Quick Help Commands. * v: Quick Help Commands. * vc.el: Support for Version Control. * wa: Quick Help Commands. * wb: Quick Help Commands. * wc: Quick Help Commands. * wd: Quick Help Commands. * z: Quick Help Commands. * |: Quick Help Commands. * ~: Quick Help Commands.