diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-12-26 10:43:57 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-12-31 12:43:32 +0100 |
| commit | 9292f595a71870eec1ffdfd187b859cc990c2f0b (patch) | |
| tree | 1068180db18bc10359ed9e18dd7616ce6072923e /lisp/vc/pcvs-parse.el | |
| parent | 43c7e05a2acadf1ba3ff24fba1706317e347a2ac (diff) | |
| download | emacs-9292f595a71870eec1ffdfd187b859cc990c2f0b.tar.gz emacs-9292f595a71870eec1ffdfd187b859cc990c2f0b.tar.bz2 emacs-9292f595a71870eec1ffdfd187b859cc990c2f0b.zip | |
; Fix typos
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)) |