lukem
Tue Sep 16 08:07:09 PDT 1997
Update of /cvsroot/src/sbin/fsck_ffs
In directory netbsd1:/var/slash-tmp/cvs-serv28025

Log Message:
imported from lite-2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/sbin/fsck_ffs/dir.c
C src/sbin/fsck_ffs/inode.c
N src/sbin/fsck_ffs/fsck.8
C src/sbin/fsck_ffs/pass1.c
C src/sbin/fsck_ffs/pass3.c
C src/sbin/fsck_ffs/Makefile
C src/sbin/fsck_ffs/pass1b.c
C src/sbin/fsck_ffs/pass2.c
C src/sbin/fsck_ffs/pass4.c
C src/sbin/fsck_ffs/utilities.c
C src/sbin/fsck_ffs/pass5.c
C src/sbin/fsck_ffs/preen.c
C src/sbin/fsck_ffs/main.c
C src/sbin/fsck_ffs/fsck.h
C src/sbin/fsck_ffs/setup.c
U src/sbin/fsck_ffs/SMM.doc/Makefile
U src/sbin/fsck_ffs/SMM.doc/0.t
U src/sbin/fsck_ffs/SMM.doc/1.t
U src/sbin/fsck_ffs/SMM.doc/2.t
U src/sbin/fsck_ffs/SMM.doc/3.t
U src/sbin/fsck_ffs/SMM.doc/4.t

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

	cvs checkout -jCSRG:yesterday -jCSRG src/sbin/fsck_ffs