From 808a36ef658c1810327b5d329469bcf5dad24b28 Mon Sep 17 00:00:00 2001 From: jkh Date: Tue, 14 Jan 1997 07:20:47 +0000 Subject: Make the long-awaited change from $Id$ to $FreeBSD$ This will make a number of things easier in the future, as well as (finally!) avoiding the Id-smashing problem which has plagued developers for so long. Boy, I'm glad we're not using sup anymore. This update would have been insane otherwise. --- gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 | 2 +- gnu/usr.bin/rcs/rcsmerge/rcsmerge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/usr.bin/rcs/rcsmerge') diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 index 96b6a46..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: rcsmerge.1,v 5.6 1995/06/01 16:23:43 eggert Exp $ +.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 a4d9b86..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: rcsmerge.c,v 1.3 1995/10/28 21:50:52 peter Exp $") +mainProg(rcsmergeId, "rcsmerge", "$FreeBSD$") { static char const cmdusage[] = "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file"; -- cgit v1.1