Mercurial > hg > CbC > CbC_gcc

view gcc/testsuite/c-c++-common/conflict-markers-4.c @ 138:fc828634a951

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 08 Nov 2018 14:17:14 +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;