[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v
From: |
Eric S. Raymond |
Subject: |
[Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v |
Date: |
Thu, 11 Oct 2007 17:07:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Eric S. Raymond <esr> 07/10/11 17:07:59
Index: files.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/files.texi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- files.texi 11 Oct 2007 14:47:16 -0000 1.11
+++ files.texi 11 Oct 2007 17:07:59 -0000 1.12
@@ -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
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/06
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/06
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/09
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/10
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/10
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/10
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/10
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/11
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/11
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Juanma Barranquero, 2007/10/11
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v,
Eric S. Raymond <=
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/13
- [Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v, Eric S. Raymond, 2007/10/20