From 9292f595a71870eec1ffdfd187b859cc990c2f0b Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 26 Dec 2022 10:43:57 +0100 Subject: ; Fix typos --- lisp/vc/pcvs-parse.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/vc/pcvs-parse.el') diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el index 77c5469a175..5b4c3019cac 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el @@ -435,7 +435,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; Conflict (and (cvs-match (concat "C \\(.*" qfile "\\)$") (path 1) (type 'CONFLICT)) - ;; C might be followed by a "spurious" U for non-mergable files + ;; C might be followed by a "spurious" U for non-mergeable files (cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t)) ;; Successful merge (cvs-match (concat "M \\(.*" qfile "\\)$") (path 1)) -- cgit v1.2.3