summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/merge/merge.c
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>1997-03-27 03:07:27 +0000
committercvs2svn <cvs2svn@FreeBSD.org>1997-03-27 03:07:27 +0000
commit1784d64eb85eb63599204bb31b826970b6661e65 (patch)
tree31089dd6c9e4a7feeac25f24574e6269b75f5db0 /gnu/usr.bin/rcs/merge/merge.c
parentfe49c1266233ddc2306072aefb4e1c1d045060fe (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;