summaryrefslogtreecommitdiff
path: root/test/files/run/t6327.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-11 07:07:26 -0700
committerPaul Phillips <paulp@improving.org>2012-09-11 07:07:26 -0700
commitf4a81fe69a13136ce66b963774476277d4464d87 (patch)
tree5252ea37a80811b96562c014e5e14c2001a33daa /test/files/run/t6327.check
parent455526f52c0d7a98f2b0bef8f29e7fb542bfe600 (diff)
parent228fb309a18d080dbcb2e51c1bbdf74da60865f9 (diff)
downloadscala-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/run/t6327.check')
-rw-r--r--test/files/run/t6327.check4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/files/run/t6327.check b/test/files/run/t6327.check
new file mode 100644
index 0000000000..f7bacac931
--- /dev/null
+++ b/test/files/run/t6327.check
@@ -0,0 +1,4 @@
+A
+A
+A
+A