summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/rcs/rcsmerge
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1995-10-29 22:06:48 +0000
committerpeter <peter@FreeBSD.org>1995-10-29 22:06:48 +0000
commit98564182f4461173ed90b170718fdd4332a839c3 (patch)
treecd6932392d726a800f9d98854ed5702fad3a8af1 /gnu/usr.bin/rcs/rcsmerge
parent9e5e91cf157c1e6703bfeb4bd6dc376699919c8b (diff)
downloadFreeBSD-src-98564182f4461173ed90b170718fdd4332a839c3.zip
FreeBSD-src-98564182f4461173ed90b170718fdd4332a839c3.tar.gz
Remove the $ Log: ... $ lines from the comments in the files that had
them. Good greif! This was causing an unimaginable amount of brain-damage! The mere fact that I griped about $ Log $ in a previous commit (misspelled deliberately here) meant that the blasted thing was being expanded from the middle of the log entry as well as the beginning, and using " * All these" as the comment leader.. AARGH!!!! We *really* need to prevent these from being expanded! (or remove the magic identifier from the source).
Diffstat (limited to 'gnu/usr.bin/rcs/rcsmerge')
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/rcsmerge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
index 30f4a8b..a4d9b86 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
@@ -28,7 +28,6 @@ Report problems and direct all questions to:
*/
/*
- * $Log: rcsmerge.c,v $
* Revision 5.15 1995/06/16 06:19:24 eggert
* Update FSF address.
*
@@ -118,7 +117,7 @@ Report problems and direct all questions to:
static char const co[] = CO;
-mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 5.15 1995/06/16 06:19:24 eggert Exp $")
+mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.3 1995/10/28 21:50:52 peter Exp $")
{
static char const cmdusage[] =
"\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file";
OpenPOWER on IntegriCloud