| Chunk |
|---|
| Conflicting content |
|---|
// try to guess the location in the M2 repo
for (String f : clf) {
if (f.contains(customM2Repo)) {
<<<<<<< HEAD
String m2 = f.substring(0, f.indexOf(customM2Repo)
+ customM2Repo.length());
xpi = new File(m2 + FIREBUG_M2 + "/" + FIREBUG_XPI);
=======
String m2 = f.substring(0,
f.indexOf(customM2Repo) + customM2Repo.length());
xpi = new File(m2 + "/" + FIREBUG_M2 + "/" + FIREBUG_XPI);
>>>>>>> 9405b5e8524cd49fb58f52d45366b3be497641ae
break;
}
} |
| Solution content |
|---|
// try to guess the location in the M2 repo
for (String f : clf) {
if (f.contains(customM2Repo)) {
String m2 = f.substring(0,
f.indexOf(customM2Repo) + customM2Repo.length());
xpi = new File(m2 + "/" + FIREBUG_M2 + "/" + FIREBUG_XPI);
break;
}
} |
| File |
|---|
| AbstractTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |