Mercurial > hg > CbC > CbC_gcc

annotate gcc/testsuite/c-c++-common/conflict-markers-6.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 /* Branch coverage of conflict marker detection:
kono
parents:
diff changeset
2 none of these should be reported as conflict markers. */
kono
parents:
diff changeset
3
kono
parents:
diff changeset
4 int a0;
kono
parents:
diff changeset
5
kono
parents:
diff changeset
6 << HEAD /* { dg-error "expected" } */
kono
parents:
diff changeset
7
kono
parents:
diff changeset
8 int a1;
kono
parents:
diff changeset
9
kono
parents:
diff changeset
10 <<<< HEAD /* { dg-error "expected" } */
kono
parents:
diff changeset
11
kono
parents:
diff changeset
12 int a2;
kono
parents:
diff changeset
13
kono
parents:
diff changeset
14 <<<<<< HEAD /* { dg-error "expected" } */
kono
parents:
diff changeset
15
kono
parents:
diff changeset
16 int b0;
kono
parents:
diff changeset
17
kono
parents:
diff changeset
18 == HEAD /* { dg-error "expected" } */
kono
parents:
diff changeset
19
kono
parents:
diff changeset
20 int b1;
kono
parents:
diff changeset
21
kono
parents:
diff changeset
22 ==== HEAD /* { dg-error "expected" } */
kono
parents:
diff changeset
23
kono
parents:
diff changeset
24 int b2;
kono
parents:
diff changeset
25
kono
parents:
diff changeset
26 ====== HEAD /* { dg-error "expected" } */
kono
parents:
diff changeset
27
kono
parents:
diff changeset
28 int c0;
kono
parents:
diff changeset
29
kono
parents:
diff changeset
30 >> HEAD /* { dg-error "expected" } */
kono
parents:
diff changeset
31
kono
parents:
diff changeset
32 int c1;
kono
parents:
diff changeset
33
kono
parents:
diff changeset
34 >>>> HEAD /* { dg-error "expected" } */
kono
parents:
diff changeset
35
kono
parents:
diff changeset
36 int c2;
kono
parents:
diff changeset
37
kono
parents:
diff changeset
38 >>>>>> HEAD /* { dg-error "expected" } */