pull up: ignore conflicts coming from access object when it is also moved (IDEA-117671)

This commit is contained in:
Anna Kozlova
2013-12-06 17:26:22 +01:00
parent 63044bd118
commit da48448b83
4 changed files with 28 additions and 3 deletions
@@ -0,0 +1,9 @@
import java.util.*;
class A {}
class B extends A {
void fo<caret>o() {
HM<String, String> hm = new HM<>();
for (Map.Entry<String, String> stringStringEntry : hm.entrySet()) {}
}
private static class HM<K, V> extends HashMap<K, V>{}
}