Mercurial > hg > CbC > CbC_gcc

comparison gcc/testsuite/c-c++-common/conflict-markers-3.c @ 111:04ced10e8804

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc 7
author kono
date Fri, 27 Oct 2017 22:46:09 +0900
parents
children
comparison
equal deleted inserted replaced
68:561a7518be6b 111:04ced10e8804
1 /* Ensure we can handle unterminated conflict markers. */
2
3 int p;
4
5 <<<<<<< HEAD /* { dg-error "conflict marker" } */
6
7 int q;
8
9 <<<<<<< HEAD /* { dg-error "conflict marker" } */
10
11 int r;