Module Name:	basesrc
Committed By:	sommerfeld
Date:		Sat Jun  2 18:04:45 UTC 2001

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

Log Message:
Avoid being overly specific since the unresolved merge conflict tags
we detect could have come from something other than cvs.


To generate a diff of this commit:
cvs rdiff -r1.66 -r1.67 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.