How to disable automated merge when do update

[xiangbin]

Hi,all
The cvs like to do automated merge when do update .But when conflicts 
happened, local file will be changed and contained both sets of changes, 
that means the original local file is lost !!!
I would really prefer cvs do not do automated merge when do update.I 
wonder if there is a way to disable this kind of behavier ?




----------------------------------------------------------------------------------------------
Confidentiality Notice: The information contained in this e-mail and any accompanying attachment(s) is intended only for the use of the intended recipient and may be confidential and/or privileged of Neusoft Group Ltd., its subsidiaries and/or its affiliates. If any reader of this communication is not the intended recipient, unauthorized use, forwarding, printing, storing, disclosure or copying is strictly prohibited, and may be unlawful. If you have received this communication in error, please immediately notify the sender by return e-mail, and delete the original message and all copies from your system. Thank you. 
-----------------------------------------------------------------------------------------------