tls
Wed Jan  8 19:48:58 PST 1997
Update of /a/cvsroot/src/bin/df
In directory netbsd1:/var/slash-tmp/cvs-serv8641

Log Message:
Import from 4.4BSD-Lite

Status:

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

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

	cvs checkout -jCSRG:yesterday -jCSRG src/bin/df