aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>1997-02-05 04:29:56 +0000
committercvs2svn <cvs2svn@FreeBSD.org>1997-02-05 04:29:56 +0000
commit860c2cf2bc6592828a3468ab8ee661042b059ae8 (patch)
treefde30676422ab07fdec2d11fde3fc5693fdbb8cf /gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
parentb61013aa0c73c687493c80193bc040d29b351fb8 (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/rcsmerge.1')
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/rcsmerge.12
1 files changed, 1 insertions, 1 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