summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/merge/merge.c
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>1999-01-21 00:55:30 +0000
committercvs2svn <cvs2svn@FreeBSD.org>1999-01-21 00:55:30 +0000
commita9e2dc176f709713f9565ed1711c958f0707eb36 (patch)
treee1676cbf88d75f6982fe157cf90f1bc6a6c21e72 /gnu/usr.bin/rcs/merge/merge.c
parent8eb115465a9db8d2a05eaf5244d6e5e8a54087c2 (diff)
Diffstat (limited to 'gnu/usr.bin/rcs/merge/merge.c')
-rw-r--r--gnu/usr.bin/rcs/merge/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index 44d33a3d054de..33d6588550942 100644
--- a/gnu/usr.bin/rcs/merge/merge.c
+++ b/gnu/usr.bin/rcs/merge/merge.c
@@ -41,7 +41,7 @@ badoption(a)
}
-mainProg(mergeId, "merge", "$Id: merge.c,v 1.8 1995/06/16 06:19:24 eggert Exp $")
+mainProg(mergeId, "merge", "$Id: merge.c,v 1.2 1995/10/28 21:50:08 peter Exp $")
{
register char const *a;
char const *arg[3], *label[3], *edarg = 0;