The merged-in comments from colladoc have use slightly changed formatting rules which pollutes changes sets and makes merging hard.
The format is changed from
in the Scala library sources to now
Even if this may be the more reasonable format, Colladoc should follow the projects standards to make working with VCS not unnecessary hard.