view gcc/testsuite/c-c++-common/conflict-markers-11.c @ 16:04ced10e8804

gcc 7
author kono
date Fri, 27 Oct 2017 22:46:09 +0900
parents
children
line wrap: on
line source

/* 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;