Module Name:	basesrc
Committed By:	pooka
Date:		Sat Mar 17 11:21:52 UTC 2001

Modified Files:
	basesrc/usr.bin/file: README apprentice.c config.h file.1 file.c file.h
	    magic.5 magic.mime patchlevel.h print.c softmagic.c
	basesrc/usr.bin/file/magdir: animation archive elf hitachi-sh hp images
	    jpeg lisp magic msdos os9

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 basesrc/usr.bin/file/README
cvs rdiff -r1.20 -r1.21 basesrc/usr.bin/file/apprentice.c \
    basesrc/usr.bin/file/softmagic.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.bin/file/config.h
cvs rdiff -r1.19 -r1.20 basesrc/usr.bin/file/file.1 \
    basesrc/usr.bin/file/file.c
cvs rdiff -r1.22 -r1.23 basesrc/usr.bin/file/file.h
cvs rdiff -r1.15 -r1.16 basesrc/usr.bin/file/magic.5
cvs rdiff -r1.2 -r1.3 basesrc/usr.bin/file/magic.mime
cvs rdiff -r1.13 -r1.14 basesrc/usr.bin/file/patchlevel.h
cvs rdiff -r1.18 -r1.19 basesrc/usr.bin/file/print.c
cvs rdiff -r1.6 -r1.7 basesrc/usr.bin/file/magdir/animation \
    basesrc/usr.bin/file/magdir/msdos
cvs rdiff -r1.8 -r1.9 basesrc/usr.bin/file/magdir/archive \
    basesrc/usr.bin/file/magdir/hp
cvs rdiff -r1.18 -r1.19 basesrc/usr.bin/file/magdir/elf
cvs rdiff -r1.1 -r1.2 basesrc/usr.bin/file/magdir/hitachi-sh \
    basesrc/usr.bin/file/magdir/jpeg
cvs rdiff -r1.11 -r1.12 basesrc/usr.bin/file/magdir/images
cvs rdiff -r1.4 -r1.5 basesrc/usr.bin/file/magdir/lisp
cvs rdiff -r1.3 -r1.4 basesrc/usr.bin/file/magdir/magic \
    basesrc/usr.bin/file/magdir/os9

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