1.1 --- a/test/tools/javac/generics/diamond/neg/Neg06.out Tue Apr 10 23:19:26 2012 -0700 1.2 +++ b/test/tools/javac/generics/diamond/neg/Neg06.out Wed Apr 11 10:50:11 2012 +0100 1.3 @@ -1,2 +1,2 @@ 1.4 -Neg06.java:16:37: compiler.err.prob.found.req.1: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg06.CFoo), (compiler.misc.infer.no.conforming.instance.exists: X, Neg06.CFoo<X>, Neg06.CSuperFoo<java.lang.String>)) 1.5 +Neg06.java:16:37: compiler.err.prob.found.req.1: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg06.CFoo), (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.String, java.lang.Number)) 1.6 1 error