On Sat, 2003-12-13 at 23:04, Fred Heitkamp wrote:
>
> Can someone explain why the "<<<<<" business is in the source file?
It's a merge conflict. (It's a good idea to check the output of cvs up
for lines starting with a capital C for conflict)
> <<<<<<< r200_span.c
>
> switch ( mode ) {
> case GL_FRONT_LEFT:
This is what you had locally before the merge.
> =======
> switch ( bufferBit ) {
> case FRONT_LEFT_BIT:
> >>>>>>> 1.2
This is what's in the repository now.
--
Earthling Michel DÃnzer | Debian (powerpc), X and DRI developer
Software libre enthusiast | http://svcs.affero.net/rm.php?r=daenzer
_______________________________________________
Devel mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/devel
