[cvsnt] Re: how to control the update action merger the new change to local file without any comments?

[ari]

  sorry for my poor express!
  if there are conflicts, the cvs will add comments like follow:
<<<<<<< About.pas
  s := '123';
=======
  i := 123;
>>>>>>> 1.11
  It is good to the source file that I can found what changed by others!
  But to the special file type like *.DFM, that will confuse the file's 
structure, so what I want is just update the file if there are conflicts 
like follow:
  s := '123';
  i := 123;

    Just merger the change, without any "<<<<<<<<<<XXXfile" or "=========="!

  regards,
                                                       ari