| 1 |
This is ../info/ediff, produced by makeinfo version 4.2 from ediff.texi. |
|---|
| 2 |
|
|---|
| 3 |
INFO-DIR-SECTION Emacs |
|---|
| 4 |
START-INFO-DIR-ENTRY |
|---|
| 5 |
* Ediff: (ediff). A visual interface for comparing and merging programs. |
|---|
| 6 |
END-INFO-DIR-ENTRY |
|---|
| 7 |
|
|---|
| 8 |
This file documents Ediff, a comprehensive visual interface to diff |
|---|
| 9 |
and patch utilities. |
|---|
| 10 |
|
|---|
| 11 |
Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software |
|---|
| 12 |
Foundation, Inc. |
|---|
| 13 |
|
|---|
| 14 |
Permission is granted to copy, distribute and/or modify this document |
|---|
| 15 |
under the terms of the GNU Free Documentation License, Version 1.1 or |
|---|
| 16 |
any later version published by the Free Software Foundation; with no |
|---|
| 17 |
Invariant Sections, with the Front-Cover texts being "A GNU Manual", |
|---|
| 18 |
and with the Back-Cover Texts as in (a) below. A copy of the license |
|---|
| 19 |
is included in the section entitled "GNU Free Documentation License" in |
|---|
| 20 |
the Emacs manual. |
|---|
| 21 |
|
|---|
| 22 |
(a) The FSF's Back-Cover Text is: "You have freedom to copy and |
|---|
| 23 |
modify this GNU Manual, like GNU software. Copies published by the Free |
|---|
| 24 |
Software Foundation raise funds for GNU development." |
|---|
| 25 |
|
|---|
| 26 |
This document is part of a collection distributed under the GNU Free |
|---|
| 27 |
Documentation License. If you want to distribute this document |
|---|
| 28 |
separately from the collection, you can do so by adding a copy of the |
|---|
| 29 |
license to the document, as described in section 6 of the license. |
|---|
| 30 |
|
|---|
| 31 |
|
|---|
| 32 |
File: ediff, Node: Index, Prev: Credits, Up: Top |
|---|
| 33 |
|
|---|
| 34 |
Index |
|---|
| 35 |
***** |
|---|
| 36 |
|
|---|
| 37 |
* Menu: |
|---|
| 38 |
|
|---|
| 39 |
* !: Quick Help Commands. |
|---|
| 40 |
* ##: Quick Help Commands. |
|---|
| 41 |
* #f: Quick Help Commands. |
|---|
| 42 |
* #h: Quick Help Commands. |
|---|
| 43 |
* $$: Quick Help Commands. |
|---|
| 44 |
* $*: Quick Help Commands. |
|---|
| 45 |
* %: Quick Help Commands. |
|---|
| 46 |
* &: Quick Help Commands. |
|---|
| 47 |
* *: Quick Help Commands. |
|---|
| 48 |
* +: Quick Help Commands. |
|---|
| 49 |
* /: Quick Help Commands. |
|---|
| 50 |
* <: Quick Help Commands. |
|---|
| 51 |
* =: Quick Help Commands. |
|---|
| 52 |
* >: Quick Help Commands. |
|---|
| 53 |
* ?: Quick Help Commands. |
|---|
| 54 |
* @: Quick Help Commands. |
|---|
| 55 |
* A: Quick Help Commands. |
|---|
| 56 |
* a: Quick Help Commands. |
|---|
| 57 |
* ab: Quick Help Commands. |
|---|
| 58 |
* ac: Quick Help Commands. |
|---|
| 59 |
* B: Quick Help Commands. |
|---|
| 60 |
* b: Quick Help Commands. |
|---|
| 61 |
* ba: Quick Help Commands. |
|---|
| 62 |
* bc: Quick Help Commands. |
|---|
| 63 |
* C: Quick Help Commands. |
|---|
| 64 |
* C-l: Quick Help Commands. |
|---|
| 65 |
* ca: Quick Help Commands. |
|---|
| 66 |
* cb: Quick Help Commands. |
|---|
| 67 |
* Comparing files and buffers: Introduction. |
|---|
| 68 |
* D: Quick Help Commands. |
|---|
| 69 |
* DEL: Quick Help Commands. |
|---|
| 70 |
* E: Quick Help Commands. |
|---|
| 71 |
* ediff: Major Entry Points. |
|---|
| 72 |
* ediff-after-flag-eol: Highlighting Difference Regions. |
|---|
| 73 |
* ediff-after-flag-mol: Highlighting Difference Regions. |
|---|
| 74 |
* ediff-after-session-group-setup-hook: Hooks. |
|---|
| 75 |
* ediff-after-setup-control-frame-hook: Hooks. |
|---|
| 76 |
* ediff-after-setup-windows-hook: Hooks. |
|---|
| 77 |
* ediff-auto-refine: Refinement of Difference Regions. |
|---|
| 78 |
* ediff-auto-refine-limit: Refinement of Difference Regions. |
|---|
| 79 |
* ediff-autostore-merges <1>: Merging and diff3. |
|---|
| 80 |
* ediff-autostore-merges <2>: Hooks. |
|---|
| 81 |
* ediff-autostore-merges: Session Groups. |
|---|
| 82 |
* ediff-before-flag-bol: Highlighting Difference Regions. |
|---|
| 83 |
* ediff-before-flag-mol: Highlighting Difference Regions. |
|---|
| 84 |
* ediff-before-session-group-setup-hook: Hooks. |
|---|
| 85 |
* ediff-before-setup-control-frame-hook: Hooks. |
|---|
| 86 |
* ediff-before-setup-hook: Hooks. |
|---|
| 87 |
* ediff-before-setup-windows-hook: Hooks. |
|---|
| 88 |
* ediff-brief-help-message-function: Notes on Heavy-duty Customization. |
|---|
| 89 |
* ediff-buffers: Major Entry Points. |
|---|
| 90 |
* ediff-buffers3: Major Entry Points. |
|---|
| 91 |
* ediff-cleanup-hook: Hooks. |
|---|
| 92 |
* ediff-coding-system-for-read: Patch and Diff Programs. |
|---|
| 93 |
* ediff-combination-pattern: Merging and diff3. |
|---|
| 94 |
* ediff-control-buffer: Quick Help Customization. |
|---|
| 95 |
* ediff-control-frame-parameters: Window and Frame Configuration. |
|---|
| 96 |
* ediff-control-frame-position-function: Window and Frame Configuration. |
|---|
| 97 |
* ediff-control-frame-upward-shift: Window and Frame Configuration. |
|---|
| 98 |
* ediff-current-diff-face-A: Highlighting Difference Regions. |
|---|
| 99 |
* ediff-current-diff-face-B: Highlighting Difference Regions. |
|---|
| 100 |
* ediff-current-diff-face-C: Highlighting Difference Regions. |
|---|
| 101 |
* ediff-custom-diff-options: Patch and Diff Programs. |
|---|
| 102 |
* ediff-custom-diff-program: Patch and Diff Programs. |
|---|
| 103 |
* ediff-default-variant: Merging and diff3. |
|---|
| 104 |
* ediff-diff-options: Patch and Diff Programs. |
|---|
| 105 |
* ediff-diff-program <1>: Patch and Diff Programs. |
|---|
| 106 |
* ediff-diff-program: Refinement of Difference Regions. |
|---|
| 107 |
* ediff-diff3-options: Patch and Diff Programs. |
|---|
| 108 |
* ediff-diff3-program: Patch and Diff Programs. |
|---|
| 109 |
* ediff-directories: Major Entry Points. |
|---|
| 110 |
* ediff-directories3: Major Entry Points. |
|---|
| 111 |
* ediff-directory-revisions: Major Entry Points. |
|---|
| 112 |
* ediff-display-help-hook: Hooks. |
|---|
| 113 |
* ediff-documentation: Major Entry Points. |
|---|
| 114 |
* ediff-even-diff-face-A: Highlighting Difference Regions. |
|---|
| 115 |
* ediff-even-diff-face-B: Highlighting Difference Regions. |
|---|
| 116 |
* ediff-even-diff-face-C: Highlighting Difference Regions. |
|---|
| 117 |
* ediff-files: Major Entry Points. |
|---|
| 118 |
* ediff-files3: Major Entry Points. |
|---|
| 119 |
* ediff-fine-diff-face-A: Highlighting Difference Regions. |
|---|
| 120 |
* ediff-fine-diff-face-B: Highlighting Difference Regions. |
|---|
| 121 |
* ediff-fine-diff-face-C: Highlighting Difference Regions. |
|---|
| 122 |
* ediff-force-faces: Highlighting Difference Regions. |
|---|
| 123 |
* ediff-forward-word: Refinement of Difference Regions. |
|---|
| 124 |
* ediff-forward-word-function: Refinement of Difference Regions. |
|---|
| 125 |
* ediff-grab-mouse: Miscellaneous. |
|---|
| 126 |
* ediff-help-message: Quick Help Customization. |
|---|
| 127 |
* ediff-highlight-all-diffs: Highlighting Difference Regions. |
|---|
| 128 |
* ediff-ignore-similar-regions: Selective Browsing. |
|---|
| 129 |
* ediff-janitor: Hooks. |
|---|
| 130 |
* ediff-job-name: Notes on Heavy-duty Customization. |
|---|
| 131 |
* ediff-keep-variants: Miscellaneous. |
|---|
| 132 |
* ediff-keymap-setup-hook: Hooks. |
|---|
| 133 |
* ediff-load-hook: Hooks. |
|---|
| 134 |
* ediff-long-help-message-function: Notes on Heavy-duty Customization. |
|---|
| 135 |
* ediff-make-buffers-readonly-at-startup: Miscellaneous. |
|---|
| 136 |
* ediff-make-frame-position: Window and Frame Configuration. |
|---|
| 137 |
* ediff-make-wide-display-function: Miscellaneous. |
|---|
| 138 |
* ediff-maybe-save-and-delete-merge <1>: Merging and diff3. |
|---|
| 139 |
* ediff-maybe-save-and-delete-merge: Hooks. |
|---|
| 140 |
* ediff-merge: Major Entry Points. |
|---|
| 141 |
* ediff-merge-buffers: Major Entry Points. |
|---|
| 142 |
* ediff-merge-buffers-with-ancestor: Major Entry Points. |
|---|
| 143 |
* ediff-merge-directories: Major Entry Points. |
|---|
| 144 |
* ediff-merge-directories-with-ancestor: Major Entry Points. |
|---|
| 145 |
* ediff-merge-directory-revisions: Major Entry Points. |
|---|
| 146 |
* ediff-merge-directory-revisions-with-ancestor: Major Entry Points. |
|---|
| 147 |
* ediff-merge-filename-prefix: Merging and diff3. |
|---|
| 148 |
* ediff-merge-files: Major Entry Points. |
|---|
| 149 |
* ediff-merge-files-with-ancestor: Major Entry Points. |
|---|
| 150 |
* ediff-merge-revisions: Major Entry Points. |
|---|
| 151 |
* ediff-merge-revisions-with-ancestor: Major Entry Points. |
|---|
| 152 |
* ediff-merge-split-window-function: Miscellaneous. |
|---|
| 153 |
* ediff-merge-window-share: Merging and diff3. |
|---|
| 154 |
* ediff-merge-with-ancestor: Major Entry Points. |
|---|
| 155 |
* ediff-meta-buffer-keymap-setup-hook: Hooks. |
|---|
| 156 |
* ediff-meta-buffer-map: Hooks. |
|---|
| 157 |
* ediff-mode-hook: Hooks. |
|---|
| 158 |
* ediff-mode-map: Hooks. |
|---|
| 159 |
* ediff-narrow-control-frame-leftward-shift: Window and Frame Configuration. |
|---|
| 160 |
* ediff-no-emacs-help-in-control-buffer: Miscellaneous. |
|---|
| 161 |
* ediff-odd-diff-face-A: Highlighting Difference Regions. |
|---|
| 162 |
* ediff-odd-diff-face-B: Highlighting Difference Regions. |
|---|
| 163 |
* ediff-odd-diff-face-C: Highlighting Difference Regions. |
|---|
| 164 |
* ediff-patch-buffer: Major Entry Points. |
|---|
| 165 |
* ediff-patch-default-directory: Patch and Diff Programs. |
|---|
| 166 |
* ediff-patch-file: Major Entry Points. |
|---|
| 167 |
* ediff-patch-options: Patch and Diff Programs. |
|---|
| 168 |
* ediff-patch-program: Patch and Diff Programs. |
|---|
| 169 |
* ediff-prefer-iconified-control-frame: Window and Frame Configuration. |
|---|
| 170 |
* ediff-prepare-buffer-hook <1>: Customizing the Mode Line. |
|---|
| 171 |
* ediff-prepare-buffer-hook: Hooks. |
|---|
| 172 |
* ediff-profile: Other Session Commands. |
|---|
| 173 |
* ediff-quit-hook: Hooks. |
|---|
| 174 |
* ediff-quit-merge-hook <1>: Merging and diff3. |
|---|
| 175 |
* ediff-quit-merge-hook: Hooks. |
|---|
| 176 |
* ediff-quit-session-group-hook: Hooks. |
|---|
| 177 |
* ediff-quit-widened: Narrowing. |
|---|
| 178 |
* ediff-regions-linewise: Major Entry Points. |
|---|
| 179 |
* ediff-regions-wordwise: Major Entry Points. |
|---|
| 180 |
* ediff-registry-setup-hook: Hooks. |
|---|
| 181 |
* ediff-revert-buffers-then-recompute-diffs: Other Session Commands. |
|---|
| 182 |
* ediff-revision: Major Entry Points. |
|---|
| 183 |
* ediff-save-buffer: Patch and Diff Programs. |
|---|
| 184 |
* ediff-select-hook: Hooks. |
|---|
| 185 |
* ediff-setup: Notes on Heavy-duty Customization. |
|---|
| 186 |
* ediff-setup-windows: Window and Frame Configuration. |
|---|
| 187 |
* ediff-setup-windows-multiframe: Window and Frame Configuration. |
|---|
| 188 |
* ediff-setup-windows-plain: Window and Frame Configuration. |
|---|
| 189 |
* ediff-show-clashes-only: Merging and diff3. |
|---|
| 190 |
* ediff-show-registry: Other Session Commands. |
|---|
| 191 |
* ediff-split-window-function: Miscellaneous. |
|---|
| 192 |
* ediff-start-narrowed: Narrowing. |
|---|
| 193 |
* ediff-startup-hook <1>: Notes on Heavy-duty Customization. |
|---|
| 194 |
* ediff-startup-hook <2>: Quick Help Customization. |
|---|
| 195 |
* ediff-startup-hook: Hooks. |
|---|
| 196 |
* ediff-suspend-hook: Hooks. |
|---|
| 197 |
* ediff-toggle-multiframe <1>: Window and Frame Configuration. |
|---|
| 198 |
* ediff-toggle-multiframe: Other Session Commands. |
|---|
| 199 |
* ediff-toggle-read-only-function: Miscellaneous. |
|---|
| 200 |
* ediff-unselect-hook: Hooks. |
|---|
| 201 |
* ediff-use-last-dir <1>: Miscellaneous. |
|---|
| 202 |
* ediff-use-last-dir: Major Entry Points. |
|---|
| 203 |
* ediff-use-long-help-message: Quick Help Customization. |
|---|
| 204 |
* ediff-version-control-package: Support for Version Control. |
|---|
| 205 |
* ediff-wide-control-frame-rightward-shift: Window and Frame Configuration. |
|---|
| 206 |
* ediff-window-setup-function: Window and Frame Configuration. |
|---|
| 207 |
* ediff-windows-linewise: Major Entry Points. |
|---|
| 208 |
* ediff-windows-wordwise: Major Entry Points. |
|---|
| 209 |
* ediff-word-1: Refinement of Difference Regions. |
|---|
| 210 |
* ediff-word-2: Refinement of Difference Regions. |
|---|
| 211 |
* ediff-word-3: Refinement of Difference Regions. |
|---|
| 212 |
* ediff-word-4: Refinement of Difference Regions. |
|---|
| 213 |
* ediff-word-mode: Notes on Heavy-duty Customization. |
|---|
| 214 |
* ediff3: Major Entry Points. |
|---|
| 215 |
* edir-merge-revisions: Major Entry Points. |
|---|
| 216 |
* edir-merge-revisions-with-ancestor: Major Entry Points. |
|---|
| 217 |
* edir-revisions: Major Entry Points. |
|---|
| 218 |
* edirs: Major Entry Points. |
|---|
| 219 |
* edirs-merge: Major Entry Points. |
|---|
| 220 |
* edirs-merge-with-ancestor: Major Entry Points. |
|---|
| 221 |
* edirs3: Major Entry Points. |
|---|
| 222 |
* epatch: Major Entry Points. |
|---|
| 223 |
* epatch-buffer: Major Entry Points. |
|---|
| 224 |
* eregistry: Other Session Commands. |
|---|
| 225 |
* Finding differences: Introduction. |
|---|
| 226 |
* G: Quick Help Commands. |
|---|
| 227 |
* ga: Quick Help Commands. |
|---|
| 228 |
* gb: Quick Help Commands. |
|---|
| 229 |
* gc: Quick Help Commands. |
|---|
| 230 |
* generic-sc.el: Support for Version Control. |
|---|
| 231 |
* h: Quick Help Commands. |
|---|
| 232 |
* i: Quick Help Commands. |
|---|
| 233 |
* j: Quick Help Commands. |
|---|
| 234 |
* M: Quick Help Commands. |
|---|
| 235 |
* m: Quick Help Commands. |
|---|
| 236 |
* Merging files and buffers: Introduction. |
|---|
| 237 |
* mode-line.el: Customizing the Mode Line. |
|---|
| 238 |
* Multi-file patches: Session Groups. |
|---|
| 239 |
* n: Quick Help Commands. |
|---|
| 240 |
* p: Quick Help Commands. |
|---|
| 241 |
* Patching files and buffers: Introduction. |
|---|
| 242 |
* pcl-cvs.el: Support for Version Control. |
|---|
| 243 |
* q: Quick Help Commands. |
|---|
| 244 |
* R: Quick Help Commands. |
|---|
| 245 |
* r: Quick Help Commands. |
|---|
| 246 |
* ra: Quick Help Commands. |
|---|
| 247 |
* rb: Quick Help Commands. |
|---|
| 248 |
* rc: Quick Help Commands. |
|---|
| 249 |
* rcs.el: Support for Version Control. |
|---|
| 250 |
* s: Quick Help Commands. |
|---|
| 251 |
* SPC: Quick Help Commands. |
|---|
| 252 |
* uniquify.el: Customizing the Mode Line. |
|---|
| 253 |
* V: Quick Help Commands. |
|---|
| 254 |
* v: Quick Help Commands. |
|---|
| 255 |
* vc.el: Support for Version Control. |
|---|
| 256 |
* wa: Quick Help Commands. |
|---|
| 257 |
* wb: Quick Help Commands. |
|---|
| 258 |
* wc: Quick Help Commands. |
|---|
| 259 |
* wd: Quick Help Commands. |
|---|
| 260 |
* z: Quick Help Commands. |
|---|
| 261 |
* |: Quick Help Commands. |
|---|
| 262 |
* ~: Quick Help Commands. |
|---|
| 263 |
|
|---|
| 264 |
|
|---|
