Mercurial > hg > CbC > CbC_gcc

view gcc/testsuite/c-c++-common/conflict-markers-3.c @ 158:494b0b89df80 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
...
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 25 May 2020 18:13:55 +0900
parents 04ced10e8804
children
line wrap: on
line source

/* Ensure we can handle unterminated conflict markers.  */

int p;

<<<<<<< HEAD  /* { dg-error "conflict marker" } */

int q;

<<<<<<< HEAD  /* { dg-error "conflict marker" } */

int r;