Merge conflict?

[Jacob Burckhardt]

Jacob Burckhardt writes:
> Tristan Juricek writes:
> > I'm getting a merge conflict when merging files that only have lines
> > deleted from the branch to the main repository. 

...

> > 
> > I'm wondering if anyone else has seen this behavior.
> 
> It sounds like it might be the same bug for which one of the cvs
> maintainers checked in a fix last week.
> 

...

> The author of the bug fix, Karl Tomlinson, thought that there are
> still some cases which his patch does not handle, so it might be good
> to try to test your case on Karl's patch.  I will be glad to help you
> do that testing if you send me your files ...

Thanks for sending me your files.  I reproduced the merge bug in
cvs-1.11.  I also tested your case on Karl's bug fix and his fix
correctly handled it.  One of the cvs maintainers already checked in
that fix, which means the next release of CVS will handle this case.