summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-09-22 16:41:40 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-09-22 16:42:20 +0200
commitb4cc68a79d70fe8911073c608aa6767244fe28de (patch)
treeca7e4df33c4e5404f18e0b664e28c7c8bc4e3375 /test/files/jvm
parentcd2bbaaf70d2f35e23c0bd5f5c84240fa1c22d3f (diff)
parent03aaf05edda92344acc642fb9e58546a8a37d33c (diff)
downloadscala-b4cc68a79d70fe8911073c608aa6767244fe28de.tar.gz
scala-b4cc68a79d70fe8911073c608aa6767244fe28de.tar.bz2
scala-b4cc68a79d70fe8911073c608aa6767244fe28de.zip
Merge commit '03aaf05' into merge-2.11-to-2.12-sep-22
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/throws-annot-from-java.check8
1 files changed, 3 insertions, 5 deletions
diff --git a/test/files/jvm/throws-annot-from-java.check b/test/files/jvm/throws-annot-from-java.check
index ace264a4f5..bf639260e7 100644
--- a/test/files/jvm/throws-annot-from-java.check
+++ b/test/files/jvm/throws-annot-from-java.check
@@ -1,10 +1,8 @@
scala> :power
-** Power User mode enabled - BEEP WHIR GYVE **
-** :phase has been set to 'typer'. **
-** scala.tools.nsc._ has been imported **
-** global._, definitions._ also imported **
-** Try :help, :vals, power.<tab> **
+Power mode enabled. :phase is at typer.
+import scala.tools.nsc._, intp.global._, definitions._
+Try :help or completions for vals._ and power._
scala> :paste
// Entering paste mode (ctrl-D to finish)