Add qdf24xx base tuning support.
[official-gcc.git] / gcc / testsuite / c-c++-common / conflict-markers-1.c
blobb9b3bab316dc9646d73938068959605ea98b5afa
1 int p;
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" } */
11 int q;