diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 1997-02-05 04:29:56 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 1997-02-05 04:29:56 +0000 |
| commit | 860c2cf2bc6592828a3468ab8ee661042b059ae8 (patch) | |
| tree | fde30676422ab07fdec2d11fde3fc5693fdbb8cf /gnu/usr.bin/rcs/rcsmerge | |
| parent | b61013aa0c73c687493c80193bc040d29b351fb8 (diff) | |
This commit was manufactured by cvs2svn to create tagupstream/2.1.6_cvsrelease/2.1.6_cvs
'RELENG_2_1_6_RELEASE'.
This commit was manufactured to restore the state of the 2.1.6-RELEASE image.
Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.
Diffstat (limited to 'gnu/usr.bin/rcs/rcsmerge')
| -rw-r--r-- | gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/rcs/rcsmerge/rcsmerge.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 index 3ea28e8be3a0..60068447d3f1 100644 --- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 +++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 @@ -2,7 +2,7 @@ .ds Rv \\$3 .ds Dt \\$4 .. -.Id $Id: rcsmerge.1,v 1.1.1.1 1993/06/18 04:22:16 jkh Exp $ +.Id $Id: rcsmerge.1,v 1.1.1.1.8.1 1996/02/23 09:32:18 peter Exp $ .ds r \&\s-1RCS\s0 .if n .ds - \%-- .if t .ds - \(em diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c index 0953a985c7c4..9a247d1e9855 100644 --- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c +++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c @@ -117,7 +117,7 @@ Report problems and direct all questions to: static char const co[] = CO; -mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.4 1995/10/29 22:06:45 peter Exp $") +mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.2.4.1 1996/02/23 09:32:19 peter Exp $") { static char const cmdusage[] = "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file"; |