From 6100e6c2c9a05beae724a458b7da04447339c31f Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 4 Jan 2010 00:32:22 +0000
Subject: [PATCH] Add check for subversion "original" marker.

---
 usr.bin/make/parse.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 2c651645b240..3d9a92af71ca 100644
--- 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 "