From ad17b552b8f7c3a435ad8de71cd7268f905a1b8d Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 8 Sep 2015 13:23:22 -0400 Subject: Merge remote-tracking branch 'origin/2.11.x' into 2.12.x only trivial merge conflicts here. not dealing with PR #4333 in this merge because there is a substantial conflict there -- so that's why I stopped at 63daba33ae99471175e9d7b20792324615f5999b for now --- test/files/neg/t8597b.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/files/neg/t8597b.scala') diff --git a/test/files/neg/t8597b.scala b/test/files/neg/t8597b.scala index b29d591cb1..cbf0bf1c5a 100644 --- a/test/files/neg/t8597b.scala +++ b/test/files/neg/t8597b.scala @@ -4,7 +4,7 @@ object Unchecked { // t is a fresh pattern type variable, despite our attempts to // backtick our way to the enclosing `t`. Under this interpretation, - // the absense of an unchecked warning is expected. + // the absence of an unchecked warning is expected. (null: Any) match { case _: Some[t] => // no warn } -- cgit v1.2.3