diff options
| author | Eric S. Raymond | 2007-10-11 17:07:59 +0000 |
|---|---|---|
| committer | Eric S. Raymond | 2007-10-11 17:07:59 +0000 |
| commit | f5950176231a19c7031807c32bee6e9ddadd2010 (patch) | |
| tree | 70f8fb011ecc13f2b283c4b48b1ca85d0a778ac0 | |
| parent | f23c992e985680ec7d5ef80d3aaf8879f9767573 (diff) | |
| download | emacs-f5950176231a19c7031807c32bee6e9ddadd2010.tar.gz emacs-f5950176231a19c7031807c32bee6e9ddadd2010.zip | |
More fixes from Robert J. Chassell.
| -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 | |||
| 1710 | the work file. | 1710 | the work file. |
| 1711 | 1711 | ||
| 1712 | Here is what @kbd{C-x v v} does when using a merging-based system | 1712 | Here is what @kbd{C-x v v} does when using a merging-based system |
| 1713 | (such as CVS or Subversion in their defaiult merging mode): | 1713 | (such as CVS or Subversion in their default merging mode): |
| 1714 | 1714 | ||
| 1715 | @itemize @bullet | 1715 | @itemize @bullet |
| 1716 | @item | 1716 | @item |
| @@ -1914,11 +1914,11 @@ from all the checked-in revisions). You can also specify a snapshot name | |||
| 1914 | @end ifnottex | 1914 | @end ifnottex |
| 1915 | instead of one or both revision ID. | 1915 | instead of one or both revision ID. |
| 1916 | 1916 | ||
| 1917 | Note that if your version-control system is file-oriented (SCCS, RCS, | 1917 | Note that if your version-control system is file-oriented (SCCS, |
| 1918 | CVS) rather than fileset-oriented (CVS, Subversion, GNU Arch) specifying | 1918 | RCS, CVS) rather than fileset-oriented (Subversion, GNU Arch, git, |
| 1919 | a revision of a multiple-file fileset by revision ID (as opposed to a snapshot | 1919 | Mercurial) specifying a revision of a multiple-file fileset by |
| 1920 | name or RSCCS/RCS tag) is unlikely to return diffs that are connected in | 1920 | revision ID (as opposed to a snapshot name or RSCCS/RCS tag) is |
| 1921 | any meaningful way. | 1921 | unlikely to return diffs that are connected in any meaningful way. |
| 1922 | 1922 | ||
| 1923 | If you invoke @kbd{C-u C-x v =} or @kbd{C-u C-x v =} from a buffer | 1923 | If you invoke @kbd{C-u C-x v =} or @kbd{C-u C-x v =} from a buffer |
| 1924 | that is neither visiting a version-controlled file nor a VC Dired | 1924 | that is neither visiting a version-controlled file nor a VC Dired |