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
Wattributes-10.c: Add -fno-common option on hppa*-*-hpux*.
[official-gcc.git]
/
gcc
/
testsuite
/
c-c++-common
/
conflict-markers-4.c
blob
a3c53ea1b1c2e8d2ab144c10fa69a73cdd0ffa6d
1
/* Ensure we can handle mismatched conflict markers. */
2
3
int
p
;
4
5
>>>>>>>
Some commit message
/* { dg-error "conflict marker" } */
6
7
int
q
;
8
9
>>>>>>>
Some other commit message
/* { dg-error "conflict marker" } */
10
11
int
r
;