1.1 --- a/test/tools/javac/generics/diamond/neg/Neg06.out Tue Feb 12 13:36:56 2013 +0000 1.2 +++ b/test/tools/javac/generics/diamond/neg/Neg06.out Tue Feb 12 19:25:09 2013 +0000 1.3 @@ -1,2 +1,2 @@ 1.4 -Neg06.java:16:37: compiler.err.prob.found.req: (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.5 +Neg06.java:16:37: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg06.CFoo), (compiler.misc.incompatible.eq.upper.bounds: X, java.lang.String, java.lang.Number)) 1.6 1 error