mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-18 09:34:34 +07:00
show conflicts unification;
encapsulate fields: rise conflicts; tests
This commit is contained in:
@@ -4,7 +4,11 @@ class Test implements I {
|
||||
return myField;
|
||||
}
|
||||
|
||||
void bar(I i) {
|
||||
void foo() {
|
||||
myField.foo();
|
||||
}
|
||||
|
||||
void bar(I i) {
|
||||
i.foo();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user