"Gallardo Rico, Alberto Ramon" <agallardo at indra.es> writes: > C:\pruebas\test>cvs --version > > Concurrent Versions System (CVSNT) 1.11.1.3 Prerelease (Build 68) > (client/server) Build 68 of CVSNT had this kind of problem with merging while updating. (There where tons of postings on this list...) Update your CVSNT and it's okay. bye, OK.