38a39,48
> * Revision 1.4 1995/10/28 21:49:36 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/lib/rcsedit.c 11927 1995-10-29 19:31:11Z peter $ support)
> *
205c215
< libId(editId, "$Id: rcsedit.c,v 5.19 1995/06/16 06:19:24 eggert Exp $")
---
> libId(editId, "$Id: rcsedit.c,v 1.4 1995/10/28 21:49:36 peter Exp $")
1051a1062
> case FreeBSD:
1055c1066
< marker==Id || RCSv<VERSION(4)
---
> marker==Id || marker==FreeBSD || RCSv<VERSION(4)