Mercurial > emacs
changeset 71118:fde97bba5e37
Fix typos.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Wed, 31 May 2006 20:22:59 +0000 |
| parents | 75ee8b77b134 |
| children | 9c9b855e9a82 |
| files | man/ediff.texi |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/man/ediff.texi Wed May 31 20:18:27 2006 +0000 +++ b/man/ediff.texi Wed May 31 20:22:59 2006 +0000 @@ -135,7 +135,7 @@ @chapter Major Entry Points When Ediff starts up, it displays a small control window, which accepts the -Ediff commands and two or three windows displaying the files to be compared +Ediff commands, and two or three windows displaying the files to be compared or merged. The control window can be in its own small frame or it can be part of a bigger frame that displays other buffers. In any case, it is important that the control window be active (i.e., be the one receiving the @@ -829,7 +829,7 @@ instance, if Ediff is merging according to the `combined' policy, then the merge region is skipped over if it is different from the combination of the regions in buffers A and B. (Warning: swapping buffers A and B will confuse -things in this respect). If the merge region is marked as `prefer-A' then +things in this respect.) If the merge region is marked as `prefer-A' then this region will be skipped if it differs from the current difference region in buffer A, etc. @@ -1599,8 +1599,6 @@ @vindex ediff-ignore-case Finally, Ediff can be told to ignore the case of the letters. This behavior can be toggled with @kbd{#c} and it is controlled with three variables: -Toggle case sensitivity in the diff program. All diffs are recomputed. -Case sensitivity is controlled by the variables @code{ediff-ignore-case-option}, @code{ediff-ignore-case-option3}, and @code{ediff-ignore-case}.