Mercurial > hg > CbC > CbC_gcc

annotate gcc/testsuite/c-c++-common/conflict-markers-4.c @ 144:8f4e72ab4e11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix segmentation fault caused by nothing next cur_op to end
author Takahiro SHIMIZU <anatofuz@cr.ie.u-ryukyu.ac.jp>
date Sun, 23 Dec 2018 21:23:56 +0900
parents 04ced10e8804
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
111
kono
parents:
diff changeset
1 /* Ensure we can handle mismatched conflict markers. */
kono
parents:
diff changeset
2
kono
parents:
diff changeset
3 int p;
kono
parents:
diff changeset
4
kono
parents:
diff changeset
5 >>>>>>> Some commit message /* { 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 >>>>>>> Some other commit message /* { dg-error "conflict marker" } */
kono
parents:
diff changeset
10
kono
parents:
diff changeset
11 int r;