| Chunk |
|---|
| Conflicting content |
|---|
if (c == '"') {
i++;
break;
<<<<<<< HEAD
} else if (c == '\\' && i + 1 < cursor) {
name.append(text.charAt(i + 1));
=======
} else if (c == '\\') {
if (i + 1 < cursor) {
name.append(text.charAt(i + 1));
}
>>>>>>> e99c012503bbd205cbaa9f16f9894ca5ffeaaf76
i += 2;
} else {
name.append(c); |
| Solution content |
|---|
if (c == '"') {
i++;
break;
} else if (c == '\\') {
if (i + 1 < cursor) {
name.append(text.charAt(i + 1));
}
i += 2;
} else {
name.append(c); |
| File |
|---|
| Rfc822Tokenizer.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
comment.append(c);
level++;
i++;
<<<<<<< HEAD
} else if (c == '\\' && i + 1 < cursor) {
comment.append(text.charAt(i + 1));
=======
} else if (c == '\\') {
if (i + 1 < cursor) {
comment.append(text.charAt(i + 1));
}
>>>>>>> e99c012503bbd205cbaa9f16f9894ca5ffeaaf76
i += 2;
} else {
comment.append(c); |
| Solution content |
|---|
comment.append(c);
level++;
i++;
} else if (c == '\\') {
if (i + 1 < cursor) {
comment.append(text.charAt(i + 1));
}
i += 2;
} else {
comment.append(c); |
| File |
|---|
| Rfc822Tokenizer.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |