Module Name:	basesrc
Committed By:	fvdl
Date:		Tue Oct 26 23:20:12 UTC 1999

Modified Files:
	basesrc/sbin/fsck_ffs [fvdl-softdep]: inode.c pass5.c setup.c
	    utilities.c

Log Message:
Fix some merge mistakes.


To generate a diff of this commit:
cvs rdiff -r1.30.4.1 -r1.30.4.2 basesrc/sbin/fsck_ffs/inode.c
cvs rdiff -r1.20.4.2 -r1.20.4.3 basesrc/sbin/fsck_ffs/pass5.c
cvs rdiff -r1.36.2.1 -r1.36.2.2 basesrc/sbin/fsck_ffs/setup.c
cvs rdiff -r1.25.4.1 -r1.25.4.2 basesrc/sbin/fsck_ffs/utilities.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.