summaryrefslogtreecommitdiff
path: root/test/files/run/t8918-unary-ids.check
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-07-13 08:42:11 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-07-13 11:45:02 +1000
commit18e3e61778918e4e802b8fb75789635409523372 (patch)
tree18d67da301f0b63667e9393d3e336b1fcb5e1875 /test/files/run/t8918-unary-ids.check
parentb92c3aff1ab8c76c4816bd7b1a82a0f87d787837 (diff)
parent52fde52920d93325310e5544991feeea03e5c763 (diff)
downloadscala-18e3e61778918e4e802b8fb75789635409523372.tar.gz
scala-18e3e61778918e4e802b8fb75789635409523372.tar.bz2
scala-18e3e61778918e4e802b8fb75789635409523372.zip
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150713
Conflicts: src/eclipse/partest/.classpath src/eclipse/repl/.classpath test/files/run/nothingTypeNoFramesNoDce.scala test/files/run/repl-javap-app.check Also fixup two .classpath files with updated partest, xml and parser combinators JARs.
Diffstat (limited to 'test/files/run/t8918-unary-ids.check')
-rw-r--r--test/files/run/t8918-unary-ids.check7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/files/run/t8918-unary-ids.check b/test/files/run/t8918-unary-ids.check
new file mode 100644
index 0000000000..92f02371c7
--- /dev/null
+++ b/test/files/run/t8918-unary-ids.check
@@ -0,0 +1,7 @@
+Expected 41 lines, got 39
+--- expected
++++ actual
+@@ -1,3 +1,1 @@
+-Type in expressions to have them evaluated.
+-Type :help for more information.
+