"Valeriy E. Ushakov" wrote:

> You can check cvs update output for files marked with '?' - which are
> not supposed to be there, but be aware that files like *.o are not
> reported by cvs.

You can use "cvs update -I\! -ICVS" to catch all files that are not
supposed to be there, including those .#* files left over after merges.

Cheers,
Simon.