diff -r 961ae2608114 -r d032d5090fd5 test/tools/javac/generics/InheritanceConflict.java
--- a/test/tools/javac/generics/InheritanceConflict.java	Wed Apr 09 13:19:01 2008 +0100
+++ b/test/tools/javac/generics/InheritanceConflict.java	Wed Apr 09 13:41:45 2008 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 4984158
  * @summary two inherited methods with same signature
- * @author gafter
+ * @author gafter, Maurizio Cimadamore
  *
  * @compile/fail -source 1.5 InheritanceConflict.java
  */
@@ -34,8 +34,11 @@
 
 class A<T> {
     void f(String s) {}
+}
+
+class B<T> extends A<T> {
     void f(T t) {}
 }
 
-class B extends A<String> {
+class C extends B<String> {
 }