Hi!
It seems that the package version of vc.el (in package vc) is
out of date. There is a function vc-resolve-conflicts in the
newer versions ( at least the one distributed with emacs-20.7).
This function is expected by pcl-cvs. Would it be possible to
update the vc package. I am not an elisp hacker, or I would
have sent you the patches ;-)
Cheers,
Palle Girgensohn
--
Partitur Informationsteknik AB
Wenner-Gren Center +46 8 566 280 02
113 46 Stockholm +46 70 785 86 02
Sweden girgen(a)partitur.se