Mercurial > hg > CbC > CbC_gcc

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
111
kono
parents:
diff changeset
1 /* Ensure we can handle unterminated conflict markers. */
kono
parents:
diff changeset
2
kono
parents:
diff changeset
3 int p;
kono
parents:
diff changeset
4
kono
parents:
diff changeset
5 <<<<<<< HEAD /* { dg-error "conflict marker" } */
kono
parents:
diff changeset
6
kono
parents:
diff changeset
7 int q;
kono
parents:
diff changeset
8
kono
parents:
diff changeset
9 <<<<<<< HEAD /* { dg-error "conflict marker" } */
kono
parents:
diff changeset
10
kono
parents:
diff changeset
11 int r;