[PD-dev] [OT] cvs without merges

[Frank Barknecht]

Hallo,

sorry for the off-topic cvs question. I didn't find the answer in the
(long) cvs man page: 

Sometimes, or rather often, while doing a cvs update, cvs tries to
merge two revisions together, but fails keeping the syntax correct.
Did you find this as well? And how can I get rid of cvs doing that?

Thank you.

ciao
-- 
 Frank Barknecht                               _ ______footils.org__