| 1 |
/* { dg-options "-fdiagnostics-show-caret" } */ |
| 2 |
|
| 3 |
<<<<<<< HEAD /* { dg-error "conflict marker" } */ |
| 4 |
/* { dg-begin-multiline-output "" } |
| 5 |
<<<<<<< HEAD |
| 6 |
^~~~~~~ |
| 7 |
{ dg-end-multiline-output "" } */ |
| 8 |
|
| 9 |
extern int some_var; |
| 10 |
|
| 11 |
======= /* { dg-error "conflict marker" } */ |
| 12 |
/* { dg-begin-multiline-output "" } |
| 13 |
======= |
| 14 |
^~~~~~~ |
| 15 |
{ dg-end-multiline-output "" } */ |
| 16 |
|
| 17 |
extern short some_var; /* This line would lead to a warning due to the |
| 18 |
duplicate name, but it is skipped when handling |
| 19 |
the conflict marker. */ |
| 20 |
|
| 21 |
>>>>>>> Some commit message /* { dg-error "conflict marker" } */ |
| 22 |
/* { dg-begin-multiline-output "" } |
| 23 |
>>>>>>> |
| 24 |
^~~~~~~ |
| 25 |
{ dg-end-multiline-output "" } */ |