blob: 59e5a49f2bfe0ff97c1a3a85500c005fdf4bf445 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
/* { dg-options "-fdiagnostics-show-caret" } */
<<<<<<< HEAD /* { dg-error "conflict marker" } */
/* { dg-begin-multiline-output "" }
<<<<<<< HEAD
^~~~~~~
{ dg-end-multiline-output "" } */
extern int some_var;
======= /* { dg-error "conflict marker" } */
/* { dg-begin-multiline-output "" }
=======
^~~~~~~
{ dg-end-multiline-output "" } */
extern short some_var; /* This line would lead to a warning due to the
duplicate name, but it is skipped when handling
the conflict marker. */
>>>>>>> Some commit message /* { dg-error "conflict marker" } */
/* { dg-begin-multiline-output "" }
>>>>>>>
^~~~~~~
{ dg-end-multiline-output "" } */
|
