Charles G Waldman <cgw(a)fnal.gov> writes:
vc-resolve-conflicts is defined in FSF emacs 20.6's version of
but not the version of vc.el in the XEmacs packages.
Does this do something useful?
Should we modify pcl-cvs to not refer to this function, or sync up
vc.el with the FSF?
I have "officially" stopped syncing because vc.el is supposed to be
completely rewritten. It is annoying that the FSF still keeps
extending the old version too. I would say that if
vc-resolve-conflicts is reasonably isolated it would be nice to have.
Just don't spent too much effort on it.