A better error message for inheritance conflict.

And some tests for pending.

Closes SI-5358.

1 files changed, 10 insertions, 0 deletions

diff --git a/test/pending/run/bug4704run.scala b/test/pending/run/bug4704run.scala
new file mode 100644
index 0000000000..af488a56c7
--- /dev/null
+++ b/test/pending/run/bug4704run.scala
@@ -0,0 +1,10 @@
+trait MM {
+  protected def method = "bip"
+}
+trait NN {
+  protected def method = "bop"
+}
+trait OOOOO extends MM with NN {
+  override protected def method = super[MM].method + super[NN].method
+  override def hashCode = super[MM].hashCode + super[NN].hashCode
+}