*** Under CVS, if you merge changes from the repository into a working<BR>
file, and CVS detects conflicts, VC now offers to start an ediff
session to resolve them.
<P>
Alternatively, you can use the new command `vc-resolve-conflicts' to
resolve conflicts in a file at any time.  It works in any buffer that
contains conflict markers as generated by rcsmerge (which is what CVS
uses as well).
<P>