Re: Toplevel configure script

man, 12.01.2004 kl. 01.23 skrev Bryan Kadzban:
> (Yeah, as if there's more than one of them. ;-))
> 
> Just did a CVS checkout of WineX, and it appears that CVS was unable to 
> merge somebody's changes to the configure script.  There are 4 different 
> places with CVS's standard:
> 
> <<<<<<< configure
> [contents of one revision]
> =======
> [contents of the other revision]
>  >>>>>>> W.XYZ
> 
> comments (and it looks like one of these is nested, which tells me that 
> it happened twice?).

Could you perhaps be more specific about what this W.XYZ revision is,
since the above stuff does not seem to exist in the current configure
revision in CVS?