Re: merging

[Larry Jones]

Moshe Levy writes:
> 
> So, how do i avoid the automated deletions in the merge ? i think the cvs
> should atleast warn or do a diff on that kind of a change.

You don't.  As far as CVS is concerned, a change is just deleting some
old lines and inserting some new lines; what's so special about the case
where there aren't any new lines?

-Larry Jones

It's clear I'll never have a career in sports until I learn
to suppress my survival instinct. -- Calvin