summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/merge/merge.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/merge/merge.c
parenta3ab491d642b34f2d3efbc0562abc8e79b38ce09 (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 4067c184a255b..9445963f0203d 100644
--- a/gnu/usr.bin/rcs/merge/merge.c
+++ b/gnu/usr.bin/rcs/merge/merge.c
@@ -39,7 +39,7 @@ badoption(a)
}
-mainProg(mergeId, "merge", "$Id: merge.c,v 1.2 1991/08/19 03:13:55 eggert Exp $")
+mainProg(mergeId, "merge", "$Id: merge.c,v 1.1.1.1 1993/06/18 04:22:14 jkh Exp $")
{
register char const *a;
char const *label[2], *arg[3];