On Sunday, 29. April 2001 13:28, Marc Mutz wrote:
>
> It's fine with me if it gets into CVS, because my current method of
> merging things is to copy the new files over the old ones (after
> checking what has been done in CVS on that files).

Usually cvs does the merging automatically, if it is able to, if you simply 
type "cvs up" in the modified directory. However since you change nearly the 
whole files, it might result in conflicts in this case.

Regards,
Michael Häckel

_______________________________________________
Kmail Developers mailing list
Kmail@master.kde.org
http://master.kde.org/mailman/listinfo/kmail