diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-11 07:07:26 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-11 07:07:26 -0700 |
| commit | f4a81fe69a13136ce66b963774476277d4464d87 (patch) | |
| tree | 5252ea37a80811b96562c014e5e14c2001a33daa /test/files/neg/t5031b.check | |
| parent | 455526f52c0d7a98f2b0bef8f29e7fb542bfe600 (diff) | |
| parent | 228fb309a18d080dbcb2e51c1bbdf74da60865f9 (diff) | |
| download | scala-f4a81fe69a13136ce66b963774476277d4464d87.tar.gz scala-f4a81fe69a13136ce66b963774476277d4464d87.tar.bz2 scala-f4a81fe69a13136ce66b963774476277d4464d87.zip | |
Merge branch '2.10.x' into topic/inliner-logging
Conflicts:
src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
Diffstat (limited to 'test/files/neg/t5031b.check')
| -rw-r--r-- | test/files/neg/t5031b.check | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/files/neg/t5031b.check b/test/files/neg/t5031b.check new file mode 100644 index 0000000000..3bc2284a4d --- /dev/null +++ b/test/files/neg/t5031b.check @@ -0,0 +1,5 @@ +b.scala:3: error: Companions 'class Bippy' and 'object Bippy' must be defined in same file: + Found in t5031b/a.scala and t5031b/b.scala +object Bippy + ^ +one error found |