blob: 8771453e9cb8c5b26ac62b2c8d4d9d7bccec7e7d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
/* Verify that we only report conflict markers at the start of lines. */
int p;
<<<<<<< HEAD /* { dg-error "expected identifier|expected unqualified-id" } */
int q;
======= /* { dg-error "expected identifier|expected unqualified-id" } */
int r;
>>>>>>> Some commit message /* { dg-error "expected identifier|expected unqualified-id" } */
int s;
|
