aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/pcvs-parse.el2
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'."
423 (cvs-match "restoring \\(.*\\) from backup file .*$" (path 1)))) 423 (cvs-match "restoring \\(.*\\) from backup file .*$" (path 1))))
424 t) 424 t)
425 425
426 ;; Is it a succesful merge? 426 ;; Is it a successful merge?
427 ;; Figure out result of merging (ie, was there a conflict?) 427 ;; Figure out result of merging (ie, was there a conflict?)
428 (let ((qfile (regexp-quote path))) 428 (let ((qfile (regexp-quote path)))
429 (cvs-or 429 (cvs-or