Sorry, I'm confused on this, I don't do a lot of cvs work yet. I just 
updated src and pkgsrc and the file is from 19:16 this evening.

Wouldn't this be a new file?

ciao!

leam

Hubert Feyrer wrote:
> On Thu, 4 Sep 2003, leam wrote:
> 
>>make: "/usr/pkgsrc/lang/gcc3/../../mk/bsd.pkg.defaults.mk" line 90:
>>Makefile appears to contain unresolved cvs/rcs/??? merge conflicts
> 
> ...
> 
>>What do I need to re-read?
> 
> 
> The above line, then clean up the mess. :)
> 
> 
>  - Hubert
>