diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-10-11 17:07:59 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-10-11 17:07:59 +0000 |
| commit | f5950176231a19c7031807c32bee6e9ddadd2010 (patch) | |
| tree | 70f8fb011ecc13f2b283c4b48b1ca85d0a778ac0 /doc | |
| parent | f23c992e985680ec7d5ef80d3aaf8879f9767573 (diff) | |
| download | emacs-f5950176231a19c7031807c32bee6e9ddadd2010.tar.gz | |
More fixes from Robert J. Chassell.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/files.texi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 7de43dc60bc..78c72dac330 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1710,7 +1710,7 @@ is unmodified; it flips to @samp{:} as soon as you save any changes in 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 @@ from all the checked-in revisions). You can also specify a snapshot name @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 |