summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/rcs/rcsmerge
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-08-27 23:37:10 +0000
committerpeter <peter@FreeBSD.org>1999-08-27 23:37:10 +0000
commit289c0d262f52855ab454afdf7386d034fb2404b8 (patch)
tree8500936e97f809eca13f646b0a148ef28ff005be /gnu/usr.bin/rcs/rcsmerge
parent66312e4a8d4ad8bda7524141fcd8fd3fade9e807 (diff)
downloadFreeBSD-src-289c0d262f52855ab454afdf7386d034fb2404b8.zip
FreeBSD-src-289c0d262f52855ab454afdf7386d034fb2404b8.tar.gz
$Id$ -> $FreeBSD$
Diffstat (limited to 'gnu/usr.bin/rcs/rcsmerge')
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/rcsmerge.12
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/rcsmerge.c2
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 d962c22..aff6f66 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$
+.Id $FreeBSD$
.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 7555343..e09dc24 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$")
+mainProg(rcsmergeId, "rcsmerge", "$FreeBSD$")
{
static char const cmdusage[] =
"\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file";
OpenPOWER on IntegriCloud