Mercurial > emacs
changeset 85176:ecc5e7d7b8c6
More fixes from Robert J. Chassell.
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Thu, 11 Oct 2007 17:07:59 +0000 |
| parents | 7d4d92ce0b88 |
| children | 435ebb14becf |
| files | doc/emacs/files.texi |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/files.texi Thu Oct 11 16:53:58 2007 +0000 +++ b/doc/emacs/files.texi Thu Oct 11 17:07:59 2007 +0000 @@ -1710,7 +1710,7 @@ the work file. Here is what @kbd{C-x v v} does when using a merging-based system -(such as CVS or Subversion in their defaiult merging mode): +(such as CVS or Subversion in their default merging mode): @itemize @bullet @item @@ -1914,11 +1914,11 @@ @end ifnottex instead of one or both revision ID. - Note that if your version-control system is file-oriented (SCCS, RCS, -CVS) rather than fileset-oriented (CVS, Subversion, GNU Arch) specifying -a revision of a multiple-file fileset by revision ID (as opposed to a snapshot -name or RSCCS/RCS tag) is unlikely to return diffs that are connected in -any meaningful way. + Note that if your version-control system is file-oriented (SCCS, +RCS, CVS) rather than fileset-oriented (Subversion, GNU Arch, git, +Mercurial) specifying a revision of a multiple-file fileset by +revision ID (as opposed to a snapshot name or RSCCS/RCS tag) is +unlikely to return diffs that are connected in any meaningful way. If you invoke @kbd{C-u C-x v =} or @kbd{C-u C-x v =} from a buffer that is neither visiting a version-controlled file nor a VC Dired