Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Better handling of merge errors | Martin Odersky | 2015-10-22 | 1 | -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. |