Jordan K. Hubbard 1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$ ... This will make a number of things easier in the future, as well as (finally!) avoiding the Id-smashing problem which has plagued developers for so long. Boy, I'm glad we're not using sup anymore. This update would have been insane otherwise.		1997-01-14 07:20:47 +00:00
..
Makefile	Import rcs-5.7, required for full support of cvs-1.6.	1995-10-28 21:07:39 +00:00
merge.1	Make the long-awaited change from $Id$ to $FreeBSD$	1997-01-14 07:20:47 +00:00
merge.c	Make the long-awaited change from $Id$ to $FreeBSD$	1997-01-14 07:20:47 +00:00