blob: b9b3bab316dc9646d73938068959605ea98b5afa [file] [log] [blame]
int p;
<<<<<<< HEAD /* { dg-error "conflict marker" } */
extern int some_var;
======= /* { dg-error "conflict marker" } */
extern short some_var; /* This line would lead to a warning due to the
duplicate name, but it is skipped when handling
the conflict marker. */
>>>>>>> Some commit message /* { dg-error "conflict marker" } */
int q;