From da945c4613cb9a11c89649aeabf1913e3b3019dd Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Thu, 22 Oct 2015 17:11:04 +0200
Subject: 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.
---
 tests/neg/i827.scala | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 tests/neg/i827.scala

(limited to 'tests')

diff --git a/tests/neg/i827.scala b/tests/neg/i827.scala
new file mode 100644
index 000000000..cc795b590
--- /dev/null
+++ b/tests/neg/i827.scala
@@ -0,0 +1,7 @@
+trait A { trait Inner }
+trait B { self: A =>
+  trait Inner extends self.Inner
+}
+
+
+class C extends C
-- 
cgit v1.2.3