Module Name: src
Committed By: rillig
Date: Sat Aug 14 13:39:43 UTC 2021
Modified Files:
src/usr.bin/make: parse.c
Log Message:
make: fix spelling of CVS and RCS in error message
To generate a diff of this commit:
cvs rdiff -u -r1.562 -r1.563 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.562 src/usr.bin/make/parse.c:1.563
--- src/usr.bin/make/parse.c:1.562 Sat Aug 14 13:37:55 2021
+++ src/usr.bin/make/parse.c Sat Aug 14 13:39:43 2021
@@ -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 *lstar
(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;
