summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/merge/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/rcs/merge/merge.c')
-rw-r--r--gnu/usr.bin/rcs/merge/merge.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index 652352b8b30..89f5b4d481d 100644
--- a/gnu/usr.bin/rcs/merge/merge.c
+++ b/gnu/usr.bin/rcs/merge/merge.c
@@ -40,7 +40,7 @@ badoption(a)
}
-mainProg(mergeId, "merge", "$Id: merge.c,v 1.1 1995/10/18 08:41:02 deraadt Exp $")
+mainProg(mergeId, "merge", "$Id: merge.c,v 1.2 1996/05/07 12:03:16 mickey Exp $")
{
register char const *a;
char const *arg[3], *label[3], *edarg = 0;
@@ -70,6 +70,9 @@ mainProg(mergeId, "merge", "$Id: merge.c,v 1.1 1995/10/18 08:41:02 deraadt Exp $
--argc;
break;
+ case 'Z':
+ break;
+
case 'V':
printf("RCS version %s\n", RCS_version_string);
exitmain(0);