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