Mercurial > hg > CbC > CbC_gcc

view gcc/testsuite/c-c++-common/conflict-markers-11.c @ 140:4e440907fcbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy CbC goto flang in cfgexpand remove some CbC unnecessary code
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 14 Nov 2018 00:24:45 +0900
parents 04ced10e8804
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;