diff options
Diffstat (limited to 'lisp/vc/pcvs-parse.el')
| -rw-r--r-- | lisp/vc/pcvs-parse.el | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |