pcl-cvs refers to vc-resolve-conflicts
The version of pcl-cvs.el in the current xemacs-packages CVS tree
contains this goodie:
(eval-and-compile (autoload 'vc-resolve-conflicts "vc"))
vc-resolve-conflicts is defined in FSF emacs 20.6's version of vc.el
but not the version of vc.el in the XEmacs packages.
Should we modify pcl-cvs to not refer to this function, or sync up our
vc.el with the FSF?