summaryrefslogtreecommitdiff
path: root/usr.bin/make/parse.c
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2021-08-14 13:39:43 +0000
committerrillig <rillig@NetBSD.org>2021-08-14 13:39:43 +0000
commit3f515afb35ccfeb665da3dc247281315055c3a88 (patch)
tree60c9c74dcb3c94132dfeb01b20161024f24261dc /usr.bin/make/parse.c
parenta1cdd0f409cff2f4d69878c7dd2ddc021d6d32eb (diff)
make: fix spelling of CVS and RCS in error message
Diffstat (limited to 'usr.bin/make/parse.c')
-rw-r--r--usr.bin/make/parse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index a6cd64d4c5f..f832e828e43 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.562 2021/08/14 13:37:55 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.563 2021/08/14 13:39:43 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.562 2021/08/14 13:37:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.563 2021/08/14 13:39:43 rillig Exp $");
/* types and constants */
@@ -1004,7 +1004,7 @@ ParseErrorNoDependency(const char *lstart)
(strncmp(lstart, "======", 6) == 0) ||
(strncmp(lstart, ">>>>>>", 6) == 0))
Parse_Error(PARSE_FATAL,
- "Makefile appears to contain unresolved cvs/rcs/??? merge conflicts");
+ "Makefile appears to contain unresolved CVS/RCS/??? merge conflicts");
else if (lstart[0] == '.') {
const char *dirstart = lstart + 1;
const char *dirend;