| Chunk |
|---|
| Conflicting content |
|---|
doMultipleBreakpointsTest(fileName);
}
<<<<<<< HEAD
=======
@TestMetadata("multipleBreakpointsAtLine.kt")
public void testMultipleBreakpointsAtLine() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.kt");
doMultipleBreakpointsTest(fileName);
}
@TestMetadata("remappedParameterInInline.kt")
public void testRemappedParameterInInline() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/remappedParameterInInline.kt");
doMultipleBreakpointsTest(fileName);
}
>>>>>>> 25351185d49bcc79d5d13e368e6a260b929d65b6
@TestMetadata("whenEntry.kt")
public void testWhenEntry() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.kt"); |
| Solution content |
|---|
doMultipleBreakpointsTest(fileName);
}
@TestMetadata("remappedParameterInInline.kt")
public void testRemappedParameterInInline() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/remappedParameterInInline.kt");
doMultipleBreakpointsTest(fileName);
}
@TestMetadata("whenEntry.kt")
public void testWhenEntry() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.kt"); |
| File |
|---|
| KotlinEvaluateExpressionTestGenerated.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |