tls
Thu Jan  9 04:55:21 PST 1997
Update of /a/cvsroot/src/usr.bin/join
In directory netbsd1:/var/slash-tmp/cvs-serv24221

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/join/Makefile
C src/usr.bin/join/join.c
C src/usr.bin/join/join.1

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/join