summaryrefslogtreecommitdiff
path: root/man/ediff.texi
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>2002-03-20 06:41:51 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>2002-03-20 06:41:51 +0000
commit74c2ff4cdca4b528bcb302ce2a66781baddfeae4 (patch)
tree5bd722e3ae9384c124991973eac099ccb1b2b4e7 /man/ediff.texi
parent743a79af65deb52c211a8fb5b726979454e3f3b5 (diff)
downloademacs-74c2ff4cdca4b528bcb302ce2a66781baddfeae4.tar.gz
described the new "=" fiture.
Diffstat (limited to 'man/ediff.texi')
-rw-r--r--man/ediff.texi17
1 files changed, 14 insertions, 3 deletions
diff --git a/man/ediff.texi b/man/ediff.texi
index 016fa459684..e8d2cec0738 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -894,9 +894,20 @@ what exactly differs inside these chunks. Since eyeballing large pieces of
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.