diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-19 01:18:31 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-19 01:18:31 -0800 |
| commit | 5396468298b0122469e0b41da8f49860d99a2b51 (patch) | |
| tree | 4bd0a6db55e2c374402f88299b6347146719566f /lisp/vc/pcvs-parse.el | |
| parent | 7430c2a1791cc9fdd51b588998d26315489ac0d8 (diff) | |
| download | emacs-5396468298b0122469e0b41da8f49860d99a2b51.tar.gz | |
Spelling fixes.
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 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)) |