diff options
| author | Michael Kifer | 2002-03-20 06:41:51 +0000 |
|---|---|---|
| committer | Michael Kifer | 2002-03-20 06:41:51 +0000 |
| commit | 74c2ff4cdca4b528bcb302ce2a66781baddfeae4 (patch) | |
| tree | 5bd722e3ae9384c124991973eac099ccb1b2b4e7 | |
| parent | 743a79af65deb52c211a8fb5b726979454e3f3b5 (diff) | |
| download | emacs-74c2ff4cdca4b528bcb302ce2a66781baddfeae4.tar.gz emacs-74c2ff4cdca4b528bcb302ce2a66781baddfeae4.zip | |
described the new "=" fiture.
| -rw-r--r-- | man/ediff.texi | 17 |
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 | |||
| 894 | text is contrary to human nature, Ediff has a special command to help | 894 | text is contrary to human nature, Ediff has a special command to help |
| 895 | reduce the risk of developing a cataract. | 895 | reduce the risk of developing a cataract. |
| 896 | 896 | ||
| 897 | The above command compares regions within Ediff buffers. This creates a | 897 | In other situations, the currently highlighted region might be big and you |
| 898 | child Ediff session for comparing current Emacs regions in buffers A, B, or | 898 | might want to reconcile of them interactively. |
| 899 | C as follows: | 899 | |
| 900 | All of this can be done with the above comand, @kbd{=}, which | ||
| 901 | compares regions within Ediff buffers. Typing @kbd{=} creates a | ||
| 902 | child Ediff session for comparing regions in buffers A, B, or | ||
| 903 | C as follows. | ||
| 904 | |||
| 905 | First, you will be asked whether you want to compare the fine differences | ||
| 906 | between the currently highlighted buffers on a word-by-word basis. If you | ||
| 907 | accept, a child Ediff session will start using the currently highlighted | ||
| 908 | regions. Ediff will let you step over the differences word-wise. | ||
| 909 | |||
| 910 | If 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:} |
| 902 | Ediff will ask you to select regions in buffers A and B. | 913 | Ediff will ask you to select regions in buffers A and B. |