summaryrefslogtreecommitdiff
path: root/test/files/neg/t3015.check
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2011-11-23 14:14:34 -0500
committerJosh Suereth <joshua.suereth@gmail.com>2011-11-23 14:14:34 -0500
commit26aee7eb070ae35984be1d0c3d3b02d4909a6e26 (patch)
tree2448b2ee277b4a3bfd1df64e5b3e7eb02138ac32 /test/files/neg/t3015.check
parentb7b81ca286b1f426cd19befd50fbc513bb82282f (diff)
downloadscala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.gz
scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.bz2
scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.zip
Added *.log and build/ to gitignore so partest/...
Added *.log and build/ to gitignore so partest/ant artifacts don't show up in our commit messages. Also fixed whitespace issues arising from the filter-branch history rewrite for git move.
Diffstat (limited to 'test/files/neg/t3015.check')
-rw-r--r--test/files/neg/t3015.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t3015.check b/test/files/neg/t3015.check
index 0b394e23d6..43ce1dc122 100644
--- a/test/files/neg/t3015.check
+++ b/test/files/neg/t3015.check
@@ -1,11 +1,11 @@
t3015.scala:7: error: scrutinee is incompatible with pattern type;
found : _$1 where type +_$1
required: String
- val b(foo) = "foo"
+ val b(foo) = "foo"
^
t3015.scala:7: error: type mismatch;
found : String with _$1(in object Test) where type +_$1(in object Test)
required: (some other)_$1(in object Test) where type +(some other)_$1(in object Test)
- val b(foo) = "foo"
+ val b(foo) = "foo"
^
two errors found