added a comment - - edited
(7) merge to trunk has lots of coding guideline violations and modifies several unrelated changelog entries. i would strongly suggest reverting it, reviewing all modified code for coding style and doublechecking what it does to the changelog
edit : ok, changelog probably was intentional. why wasn't it mentioned in the commit message ?
<Slava> Sorry. I must recommit this with detailed description ?
<richlv> well, this time i'd say that it would be enough to fix formatting for all modified lines - but in future, describing all changes in the commit message would be highly appreciated
<Slava> You are so kind. RESOLVED r 24542
<richlv> 24542 has a commit message "updated to latest trunk "...
<Slava>Formating error starts after conflict resolving in 'valuemap.inc.php' . Now i re-resolve this conflicts.