Mercurial > hg > CbC > CbC_gcc

view gcc/testsuite/c-c++-common/conflict-markers-4.c @ 144:8f4e72ab4e11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix segmentation fault caused by nothing next cur_op to end
author Takahiro SHIMIZU <anatofuz@cr.ie.u-ryukyu.ac.jp>
date Sun, 23 Dec 2018 21:23:56 +0900
parents 04ced10e8804
children
line wrap: on
line source

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

int p;

>>>>>>> Some commit message  /* { dg-error "conflict marker" } */

int q;

>>>>>>> Some other commit message  /* { dg-error "conflict marker" } */

int r;