svn commit: r201455 - head/usr.bin/make

[David E. O'Brien]

Author: obrien
Date: Mon Jan  4 00:32:22 2010
New Revision: 201455
URL: http://svn.freebsd.org/changeset/base/201455

Log:
  Add check for subversion "original" marker.

Modified:
  head/usr.bin/make/parse.c

Modified: head/usr.bin/make/parse.c
==============================================================================
--- head/usr.bin/make/parse.c	Mon Jan  4 00:11:46 2010	(r201454)
+++ head/usr.bin/make/parse.c	Mon Jan  4 00:32:22 2010	(r201455)
@@ -802,6 +802,7 @@ ParseDoDependency(char *line)
 			 * merges.
 			 */
 			if (strncmp(line, "<<<<<<", 6) == 0 ||
+			    strncmp(line, "||||||", 6) == 0 ||
 			    strncmp(line, "======", 6) == 0 ||
 			    strncmp(line, ">>>>>>", 6) == 0) {
 				Parse_Error(PARSE_FATAL, "Makefile appears to "