From owner-svn-src-all@FreeBSD.ORG  Mon Jan  4 00:32:22 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B7DA31065679;
	Mon,  4 Jan 2010 00:32:22 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A6F8C8FC14;
	Mon,  4 Jan 2010 00:32:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o040WM2v096364;
	Mon, 4 Jan 2010 00:32:22 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o040WM4j096362;
	Mon, 4 Jan 2010 00:32:22 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201001040032.o040WM4j096362@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 4 Jan 2010 00:32:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201455 - head/usr.bin/make
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jan 2010 00:32:22 -0000

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 "