1.1 --- a/test/tools/javac/Diagnostics/6860795/T6860795.out Mon Sep 12 11:40:07 2011 -0700 1.2 +++ b/test/tools/javac/Diagnostics/6860795/T6860795.out Tue Sep 13 14:14:57 2011 +0100 1.3 @@ -1,2 +1,2 @@ 1.4 -T6860795.java:10:27: compiler.err.already.defined: x, foo 1.5 +T6860795.java:10:27: compiler.err.already.defined: kindname.variable, x, kindname.method, foo 1.6 1 error