This uses ediff (or emerge, depending on
‘cvs-idiff-imerge-handlers’) to allow you to view diffs.
If a prefix argument is given, PCL-CVS will prompt for a revision against
which the diff should be made, else the default will be to use the BASE
revision.
This command use ediff (or emerge, see above) to allow you
to do an interactive 3-way merge.
Please note: when the file status is ‘Conflict’, CVS has already performed a merge. The resulting file is not used in any way if you use this command. If you use the q command inside ‘ediff’ (to successfully terminate a merge) the file that CVS created will be overwritten.