aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite/g++.dg/conflict-markers-2.C
blob: 4fc38207184fdb3f09e526a122c56d11056d8160 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
// { dg-do compile { target c++11 } }

extern void f1 (void);
extern void f2 (void);
extern void f3 (void);
extern void f4 (void);

void test ()
{
  f1 ();
<<<<<<< HEAD // { dg-error "conflict marker" }
  f2 ();
======= // { dg-error "conflict marker" }
  f3 ();
>>>>>>> 252be53... Some commit message // { dg-error "conflict marker" }
  f4 ();
}