summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>1996-01-01 11:01:15 +0000
committercvs2svn <cvs2svn@FreeBSD.org>1996-01-01 11:01:15 +0000
commit26ce5ad3876f0ea63ab67a8bdb2ed1a5a1591a3e (patch)
tree69e72e626f1337094ba2f18cd7fded3ecaa930bf /gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
parenta3ab491d642b34f2d3efbc0562abc8e79b38ce09 (diff)
Diffstat (limited to 'gnu/usr.bin/rcs/rcsmerge/rcsmerge.c')
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/rcsmerge.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
index f5c46a82db658..38a7b7601c32b 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
@@ -35,6 +35,9 @@ Report problems and direct all questions to:
/* $Log: rcsmerge.c,v $
+ * Revision 1.2 1995/05/30 05:04:30 rgrimes
+ * Remove trailing whitespace.
+ *
* Revision 1.1.1.1 1993/06/18 04:22:16 jkh
* Updated GNU utilities
*
@@ -101,7 +104,7 @@ Report problems and direct all questions to:
static char const co[] = CO;
-mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.1.1.1 1993/06/18 04:22:16 jkh Exp $")
+mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.2 1995/05/30 05:04:30 rgrimes Exp $")
{
static char const cmdusage[] =
"\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] [-p] [-Vn] file";