merge just overwriting?

[Sagi Brody]

Hello,
        I just started using CVS. I imported my software as follows:
the development version of my sofware as the main trunk
the stable latest release as a branch

When I modify files in the branch and attempt to merge them into the
trunk (cvs update -j stable filename.c) it seems the file in the trunk
is just overwritten with the file from the branch? I also tried using
2 -j's and it did the same thing. I'm using cvs 1.11. Any help is
greatly appreciated..