mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Code Issues Projects Releases Wiki Activity

Spelling fixes.

Browse source
This commit is contained in:
Paul Eggert 2011-11-19 01:18:31 -08:00
parent 7430c2a179
commit 5396468298
110 changed files with 160 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/pcvs-parse.el
View file

@ -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))