Palle> Hi! Palle> It seems that the package version of vc.el (in package vc) is Palle> out of date. There is a function vc-resolve-conflicts in the Palle> newer versions ( at least the one distributed with emacs-20.7). Palle> This function is expected by pcl-cvs. Would it be possible to Palle> update the vc package. I am not an elisp hacker, or I would Palle> have sent you the patches ;-) Please provide your XEmacs package numbers of vc and pcl-cvs! Here are mine (Options -> Manage Packages -> List & Install): pcl-cvs 1.49 1.49 CVS frontend. vc 1.23 1.23 Version Control for Free systems. Hope this helps, Adrian Palle> Cheers, Palle> Palle Girgensohn Palle> -- Palle> Partitur Informationsteknik AB Palle> Wenner-Gren Center +46 8 566 280 02 Palle> 113 46 Stockholm +46 70 785 86 02 Palle> Sweden girgen(a)partitur.se -- Adrian Aichner <adrian(a)xemacs.org&gt;