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