Add check for subversion "original" marker.

2010-01-04 00:32:22 +00:00 · 2010-01-04 00:32:22 +00:00 · 6100e6c2c9
commit 6100e6c2c9
parent f29b8b7f41
1 changed files with 1 additions and 0 deletions
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@ -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 "