Comment #20 on issue 2310 by [email protected]: Patch: some comments and complaints on the code
http://code.google.com/p/lilypond/issues/detail?id=2310
Well, the problem obviously _is_ that you did not change the code. That is what "Lots of bad merges like the last time round" means. Please check comment 16. This change will not get committed while it breaks the regtests. And it will not fix itself.
Please actually take a look at the files and output that have been reported as being bad.
