| Chunk |
|---|
| Conflicting content |
|---|
} else
buffer.append(e.getCharacter());
<<<<<<< HEAD
if (buffer.length() == 0 || e.equals(KEY_RETURN) || e.equals(KEY_ESCAPE)) {
if (c != null)
editor.changeModeSafely(NormalMode.NAME, new ExecuteCommandHint.OnEnter(c));
else
editor.changeModeSafely(NormalMode.NAME);
=======
if (buffer.length() == 0 || e.equals(KEY_RETURN)
|| e.equals(KEY_ESCAPE) || e.equals(KEY_CTRL_C)) {
editor.changeModeSafely(NormalMode.NAME);
>>>>>>> 3b050a83aa94a0eb8f9e843c6e4b2c2b7e9e5715
}
}
|
| Solution content |
|---|
} else
buffer.append(e.getCharacter());
if (buffer.length() == 0 || e.equals(KEY_RETURN)
|| e.equals(KEY_ESCAPE) || e.equals(KEY_CTRL_C)) {
if (c != null)
editor.changeModeSafely(NormalMode.NAME, new ExecuteCommandHint.OnEnter(c));
else
editor.changeModeSafely(NormalMode.NAME);
}
}
|
| File |
|---|
| AbstractCommandParser.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |
| Method invocation |