diff options
| -rw-r--r-- | man/files.texi | 16 |
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 |
| 2521 | network interactions to a minimum. This is controlled by the variable | 2521 | network 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 |
| 2523 | entry in the local CVS subdirectory to determine the file's state (and | 2523 | only the entry in the local CVS subdirectory to determine the file's |
| 2524 | possibly information returned by previous CVS commands). One | 2524 | state (and possibly information returned by previous CVS commands). One |
| 2525 | consequence of this is that when you have modified a file, and | 2525 | consequence of this is that when you have modified a file, and somebody |
| 2526 | somebody else has already checked in other changes to the file, you | 2526 | else has already checked in other changes to the file, you are not |
| 2527 | are not notified of it until you actually try to commit. (But you can | 2527 | notified of it until you actually try to commit. (But you can try to |
| 2528 | try to pick up any recent changes from the repository first, using | 2528 | pick up any recent changes from the repository first, using @kbd{C-x v m |
| 2529 | @kbd{C-x v m RET}, @pxref{Merging}). | 2529 | RET}, @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 |
| 2532 | version backups, so that simple diff and revert operations are | 2532 | version backups, so that simple diff and revert operations are |