[cvsnt] Re: Merge-Problem: nonmergeable file needs merge

[Johannes Kilian]

>It's possible if you're using a really old vesrsion...  what's the
>output of 'cvs version'?

Yeah - you're right: cvs version reults in

Client: Concurrent Versions System (CVSNT) 2.0.9 (client/server)
Server: Concurrent Versions System (CVSNT) 1.11.1.3 (Build 66)
(client/server)

I did a "cvs -v" - and this only gives  me the client version.

So I have the server to be updated 

Thanks!

Johannes

-- 
COMPUTERBILD 15/03: Premium-e-mail-Dienste im Test
--------------------------------------------------
1. GMX TopMail - Platz 1 und Testsieger!
2. GMX ProMail - Platz 2 und Preis-Qualitätssieger!
3. Arcor - 4. web.de - 5. T-Online - 6. freenet.de - 7. daybyday - 8. e-Post