Upgrade = Site Down (wtf? The “functions.php” has an error!)

Just upgraded manually to 3.0 from 2.9.2. Using svn.

Plugins through phpmyadmin have been all deactivated. The “active_plugins” row has nothing in it.

Still, now my WP doesn’t work at all. I checked the apache error log and it is filled with these messages:

[Thu Jun 17 19:44:31 2010] [error] [client
 67.195.115.83] PHP Parse error:  syntax error,
 unexpected T_SL in
/home/MYDOMAIN/public_html/cms/wp-includes/functions.php
 on line 4047

What’s up? I checked this file and the line 4047 is this:

<<<<<<< .mine

Pls help. Now my site and my WP blog are both down!