Re: [Scribia-dev] crash & new stuff

[Lark <lar...@ya...>]

At 8:29 AM -0800 3/24/01, Ben Hines wrote:
>Yes, that means there were irreconcilable differences. The file date 
>is also set to 2019. In this case i had previously deleted the line 
>you had commented out on your own. The new file had it deleted, you 
>had it commented out, and CVS doesnt know which you want, so it does 
>that. (it is clearer when it happens in code)

Exactly.

>by the way, Erasmus was interested in scribia source so i pointed 
>him to cvs and the website. Hopefully he will be able to help.

He contacted me privately, I sent him MoreFiles 1.4.9 which he needed 
since he's using CW5.

-- 
Lark <lar...@ya...>