aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/files.texi16
1 files changed, 8 insertions, 8 deletions
diff --git a/man/files.texi b/man/files.texi
index 5a616e79065..bc99adc5977 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -2519,14 +2519,14 @@ using the watch feature.
2519@cindex remote repositories (CVS) 2519@cindex remote repositories (CVS)
2520 When a file's repository is on a remote machine, VC tries to keep 2520 When a file's repository is on a remote machine, VC tries to keep
2521network interactions to a minimum. This is controlled by the variable 2521network interactions to a minimum. This is controlled by the variable
2522@var{vc-cvs-stay-local}. If it is @code{t}, then VC uses only the 2522@var{vc-cvs-stay-local}. If it is @code{t} (the default), then VC uses
2523entry in the local CVS subdirectory to determine the file's state (and 2523only the entry in the local CVS subdirectory to determine the file's
2524possibly information returned by previous CVS commands). One 2524state (and possibly information returned by previous CVS commands). One
2525consequence of this is that when you have modified a file, and 2525consequence of this is that when you have modified a file, and somebody
2526somebody else has already checked in other changes to the file, you 2526else has already checked in other changes to the file, you are not
2527are not notified of it until you actually try to commit. (But you can 2527notified of it until you actually try to commit. (But you can try to
2528try to pick up any recent changes from the repository first, using 2528pick up any recent changes from the repository first, using @kbd{C-x v m
2529@kbd{C-x v m RET}, @pxref{Merging}). 2529RET}, @pxref{Merging}).
2530 2530
2531 When @var{vc-cvs-stay-local} is @code{t}, VC also makes local 2531 When @var{vc-cvs-stay-local} is @code{t}, VC also makes local
2532version backups, so that simple diff and revert operations are 2532version backups, so that simple diff and revert operations are