diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-10-22 17:11:04 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-10-22 17:11:04 +0200 |
| commit | da945c4613cb9a11c89649aeabf1913e3b3019dd (patch) | |
| tree | 63923ddca849eee1d8ee95140da531004910dd6c /.gitignore | |
| parent | 746889b4ed0f53e433c123ddb2b90dece1298fff (diff) | |
| download | dotty-da945c4613cb9a11c89649aeabf1913e3b3019dd.tar.gz dotty-da945c4613cb9a11c89649aeabf1913e3b3019dd.tar.bz2 dotty-da945c4613cb9a11c89649aeabf1913e3b3019dd.zip | |
Better handling of merge errors
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.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions