summaryrefslogtreecommitdiff
path: root/usr.bin/make/parse.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2001-06-02 16:17:08 +0000
committerchristos <christos@NetBSD.org>2001-06-02 16:17:08 +0000
commit45bc184ebbb883a3f1cbd701bf59cf246ecfd122 (patch)
tree42e0ef56d5d2060bc5a4c15107f47512021897f4 /usr.bin/make/parse.c
parentca4d3737307b33cdad77bc5d1a4736e9ad60d8f1 (diff)
mention `cvs' in the the previous hack so that the clueless get a clue.
Diffstat (limited to 'usr.bin/make/parse.c')
-rw-r--r--usr.bin/make/parse.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 0d4e197ec33..87a49763bae 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.65 2001/06/02 14:25:23 sommerfeld Exp $ */
+/* $NetBSD: parse.c,v 1.66 2001/06/02 16:17:08 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: parse.c,v 1.65 2001/06/02 14:25:23 sommerfeld Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.66 2001/06/02 16:17:08 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.65 2001/06/02 14:25:23 sommerfeld Exp $");
+__RCSID("$NetBSD: parse.c,v 1.66 2001/06/02 16:17:08 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -891,7 +891,8 @@ ParseDoDependency (line)
if ((strncmp(line, "<<<<<<", 6) == 0) ||
(strncmp(line, "======", 6) == 0) ||
(strncmp(line, ">>>>>>", 6) == 0))
- Parse_Error (PARSE_FATAL, "Makefile contains unresolved merge conflict");
+ Parse_Error (PARSE_FATAL,
+ "Makefile contains unresolved cvs merge conflicts");
else
Parse_Error (PARSE_FATAL, "Need an operator");
return;