tls
Mon Sep  4 17:07:29 EDT 1995
Update of /a/cvsroot/src/usr.bin/cmp
In directory pain.lcs.mit.edu:/a/users/tls/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/cmp/Makefile
N src/usr.bin/cmp/special.c
N src/usr.bin/cmp/regular.c
I src/usr.bin/cmp/obj
N src/usr.bin/cmp/misc.c
N src/usr.bin/cmp/extern.h
C src/usr.bin/cmp/cmp.c
C src/usr.bin/cmp/cmp.1
I src/usr.bin/cmp/tags

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

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