31a32,41
> * Revision 1.4 1995/10/28 21:49:12 peter
> * First part of import conflict merge from rcs-5.7 import.
> *
> * All those $Log$ entries, combined with the whitespace changes are a real
> * pain.
> *
> * I'm committing this now, before it's completely finished to get it compiling
> * and working again ASAP. Some of the FreeBSD specific features are not working
> * in this commit yet (mainly rlog stuff and $FreeBSD: head/gnu/usr.bin/rcs/co/co.c 11927 1995-10-29 19:31:11Z peter $ support)
> *
182c192
< static char const *expandarg, *suffixarg, *versionarg, *zonearg;
---
> static char const *expandarg, *suffixarg, *versionarg, *zonearg, *incexcarg;
195c205
< mainProg(coId, "co", "$Id: co.c,v 5.18 1995/06/16 06:19:24 eggert Exp $")
---
> mainProg(coId, "co", "$Id: co.c,v 1.4 1995/10/28 21:49:12 peter Exp $")
317a328,332
> case 'K': /* set keyword inclusions/exclusions */
> incexcarg = *argv;
> setIncExc(incexcarg);
> break;
>