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

gcc 7
author kono
date Fri, 27 Oct 2017 22:46:09 +0900
parents
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;