gcc/testsuite/c-c++-common/conflict-markers-1.c
raw| 1 | int p; |
| 2 | |
| 3 | <<<<<<< HEAD /* { dg-error "conflict marker" } */ |
| 4 | extern int some_var; |
| 5 | ======= /* { dg-error "conflict marker" } */ |
| 6 | extern short some_var; /* This line would lead to a warning due to the |
| 7 | duplicate name, but it is skipped when handling |
| 8 | the conflict marker. */ |
| 9 | >>>>>>> Some commit message /* { dg-error "conflict marker" } */ |
| 10 | |
| 11 | int q; |