Seemingly it sucks at doing svn merges (presumably repository should win?)

Conflict discovered in 'maintenance/tests/phpunit/includes/api/ApiSetup.php'.

Select: (p) postpone, (df) diff-full, (e) edit,

(mc) mine-conflict, (tc) theirs-conflict,

(s) show all options: svn: Can't read stdin: End of file found

PHP Fatal error: Access to undeclared static property: ApiTest::$sysopUser in /home/ci/cruisecontrol-bin-2.8.3/projects/mw/source/maintenance/tests/phpunit/includes/api/ApiTest.php on line 95

Version: unspecified
Severity: normal