Module Name:	basesrc
Committed By:	sommerfeld
Date:		Sat Jun  2 14:25:24 UTC 2001

Modified Files:
	basesrc/usr.bin/make: parse.c

Log Message:
Gratuitous make(1) hack of the morning: if operator-less lines start
with merge delimeters (<<<<<<, ======, >>>>>>), report "Makefile
contains unresolved merge conflict" rather than "Need an operator".


To generate a diff of this commit:
cvs rdiff -r1.64 -r1.65 basesrc/usr.bin/make/parse.c

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