Mercurial > hg > CbC > CbC_gcc

annotate gcc/testsuite/g++.dg/conflict-markers-2.C @ 131:84e7813d76e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc-8.2
author mir3636
date Thu, 25 Oct 2018 07:37:49 +0900
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
131
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
1 // { dg-do compile { target c++11 } }
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
2
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
3 extern void f1 (void);
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
4 extern void f2 (void);
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
5 extern void f3 (void);
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
6 extern void f4 (void);
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
7
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
8 void test ()
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
9 {
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
10 f1 ();
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
11 <<<<<<< HEAD // { dg-error "conflict marker" }
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
12 f2 ();
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
13 ======= // { dg-error "conflict marker" }
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
14 f3 ();
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
15 >>>>>>> 252be53... Some commit message // { dg-error "conflict marker" }
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
16 f4 ();
84e7813d76e9 gcc-8.2
mir3636
parents:
diff changeset
17 }