[src/trunk]: src/usr.bin/make make: fix spelling of CVS and RCS in error message

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/08619c3bf0dc
branches:  trunk
changeset: 1022913:08619c3bf0dc
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Aug 14 13:39:43 2021 +0000

description:
make: fix spelling of CVS and RCS in error message

diffstat:

 usr.bin/make/parse.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 86fed7e3e2f4 -r 08619c3bf0dc usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Sat Aug 14 13:37:55 2021 +0000
+++ b/usr.bin/make/parse.c      Sat Aug 14 13:39:43 2021 +0000
@@ -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 @@
            (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;