diff -r 02afd052face -r c4124695db0c langtools/test/tools/javac/generics/inference/7154127/T7154127.out --- a/langtools/test/tools/javac/generics/inference/7154127/T7154127.out Tue Feb 05 21:55:41 2013 -0800 +++ b/langtools/test/tools/javac/generics/inference/7154127/T7154127.out Wed Feb 06 14:03:39 2013 +0000 @@ -1,2 +1,2 @@ -T7154127.java:19:49: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: Y, T7154127.D,T7154127.B) +T7154127.java:19:49: compiler.err.prob.found.req: (compiler.misc.incompatible.upper.bounds: Y, T7154127.B,T7154127.D) 1 error