aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
894text is contrary to human nature, Ediff has a special command to help 894text is contrary to human nature, Ediff has a special command to help
895reduce the risk of developing a cataract. 895reduce the risk of developing a cataract.
896 896
897The above command compares regions within Ediff buffers. This creates a 897In other situations, the currently highlighted region might be big and you
898child Ediff session for comparing current Emacs regions in buffers A, B, or 898might want to reconcile of them interactively.
899C as follows: 899
900All of this can be done with the above comand, @kbd{=}, which
901compares regions within Ediff buffers. Typing @kbd{=} creates a
902child Ediff session for comparing regions in buffers A, B, or
903C as follows.
904
905First, you will be asked whether you want to compare the fine differences
906between the currently highlighted buffers on a word-by-word basis. If you
907accept, a child Ediff session will start using the currently highlighted
908regions. Ediff will let you step over the differences word-wise.
909
910If you reject the offer, you will be asked to select regions of your choice.
900 911
901@emph{If you are comparing 2 files or buffers:} 912@emph{If you are comparing 2 files or buffers:}
902Ediff will ask you to select regions in buffers A and B. 913Ediff will ask you to select regions in buffers A and B.