Mercurial > emacs
changeset 44029:aa071cceb8e0
described the new "=" fiture.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Wed, 20 Mar 2002 06:41:51 +0000 |
| parents | 182881d68883 |
| children | 67ba867f0082 |
| files | man/ediff.texi |
| diffstat | 1 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/man/ediff.texi Wed Mar 20 06:36:18 2002 +0000 +++ b/man/ediff.texi Wed Mar 20 06:41:51 2002 +0000 @@ -894,9 +894,20 @@ text is contrary to human nature, Ediff has a special command to help reduce the risk of developing a cataract. -The above command compares regions within Ediff buffers. This creates a -child Ediff session for comparing current Emacs regions in buffers A, B, or -C as follows: +In other situations, the currently highlighted region might be big and you +might want to reconcile of them interactively. + +All of this can be done with the above comand, @kbd{=}, which +compares regions within Ediff buffers. Typing @kbd{=} creates a +child Ediff session for comparing regions in buffers A, B, or +C as follows. + +First, you will be asked whether you want to compare the fine differences +between the currently highlighted buffers on a word-by-word basis. If you +accept, a child Ediff session will start using the currently highlighted +regions. Ediff will let you step over the differences word-wise. + +If you reject the offer, you will be asked to select regions of your choice. @emph{If you are comparing 2 files or buffers:} Ediff will ask you to select regions in buffers A and B.