aboutsummaryrefslogtreecommitdiff
path: root/tests/neg/i827.scala
Commit message (Collapse)AuthorAgeFilesLines
* Neg tests: remove xerror parameter from tests (compute based on // error)VladimirNik2016-03-031-2/+2
|
* Better handling of merge errorsMartin Odersky2015-10-221-0/+7
Instead of picking one at random, throw a MergeError which might be caught later in mergeDenot. MergeDenot has enough info to pick a simulate Scala2 linarization if the prefix comes from Scala2, or it rethrows the exception so that it becomes a type error.