diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-30 17:27:15 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-30 17:27:15 -0800 |
| commit | 22bcf2046977620a7f37bbd4dff4be4a4fffc0ed (patch) | |
| tree | 39e83ae1f1389e54aec5074029a1d430aaca2876 /lisp/vc/pcvs-parse.el | |
| parent | b30941dba07605b40efbf139eed2007d6b1e5445 (diff) | |
| download | emacs-22bcf2046977620a7f37bbd4dff4be4a4fffc0ed.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 43292ed14e4..6d2724a1172 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el @@ -423,7 +423,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (cvs-match "restoring \\(.*\\) from backup file .*$" (path 1)))) t) - ;; Is it a succesful merge? + ;; Is it a successful merge? ;; Figure out result of merging (ie, was there a conflict?) (let ((qfile (regexp-quote path))) (cvs-or |