Sign in
gnu
/
gcc
/
a6d3012b274f38b20e2a57162106f625746af6c6
/
.
/
gcc
/
testsuite
/
c-c++-common
/
conflict-markers-4.c
blob: a3c53ea1b1c2e8d2ab144c10fa69a73cdd0ffa6d [
file
] [
log
] [
blame
]
/* Ensure we can handle mismatched conflict markers. */
int
p
;
>>>>>>>
Some
commit message
/* { dg-error "conflict marker" } */
int
q
;
>>>>>>>
Some
other commit message
/* { dg-error "conflict marker" } */
int
r
;