repo.or.cz
/
official-gcc.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
libgfortran: Fix namelist read.
[official-gcc.git]
/
gcc
/
testsuite
/
g++.dg
/
conflict-markers-2.C
blob
4fc38207184fdb3f09e526a122c56d11056d8160
1
// { dg-do compile { target c++11 } }
2
3
extern void f1 (void);
4
extern void f2 (void);
5
extern void f3 (void);
6
extern void f4 (void);
7
8
void test ()
9
{
10
f1 ();
11
<<<<<<< HEAD // { dg-error "conflict marker" }
12
f2 ();
13
======= // { dg-error "conflict marker" }
14
f3 ();
15
>>>>>>> 252be53... Some commit message // { dg-error "conflict marker" }
16
f4 ();
17
}