From 5396468298b0122469e0b41da8f49860d99a2b51 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 19 Nov 2011 01:18:31 -0800 Subject: Spelling fixes. --- 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 c514026b1f1..43292ed14e4 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el @@ -430,7 +430,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 "suprious" U for non-mergeable files + ;; C might be followed by a "spurious" U for non-mergable files (cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t)) ;; Successful merge (cvs-match (concat "M \\(.*" qfile "\\)$") (path 1)) -- cgit v1.2.1