Mercurial > emacs
diff man/ediff.texi @ 46918:82d113655734
Minor spelling and grammar corrections.
author | Paul Eggert <eggert@twinsun.com> |
---|---|
date | Fri, 16 Aug 2002 06:29:40 +0000 |
parents | a1448e19a9f8 |
children | 0a70200bde27 |
line wrap: on
line diff
--- a/man/ediff.texi Fri Aug 16 04:54:20 2002 +0000 +++ b/man/ediff.texi Fri Aug 16 06:29:40 2002 +0000 @@ -262,8 +262,8 @@ dangerous, since you will always have the original contents of the file saved in another file that has the extension @file{.orig}. Furthermore, if the file is under version control, then you can always back -out to one of the previous versions (see the section on Version Countrol in -Emacs manual). +out to one of the previous versions (see the section on Version Control in +the Emacs manual). @code{ediff-patch-file} is careful about versions control: if the file to be patched is checked in, then Ediff will offer to check it out, because @@ -897,7 +897,7 @@ 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 +All of this can be done with the above command, @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.