1 // RUN: %clang_cc1 %s -verify -fsyntax-only
2
3 // Test that we recover gracefully from conflict markers left in input files.
4 // PR5238
5
6 // diff3 style
7 <<<<<<< .mine // expected-error {{version control conflict marker in file}}
8 int x = 4;
9 |||||||
10 int x = 123;
11 =======
12 float x = 17;
13 >>>>>>> .r91107
14
15 // normal style.
16 <<<<<<< .mine // expected-error {{version control conflict marker in file}}
17 typedef int y;
18 =======
19 typedef struct foo *y;
20 >>>>>>> .r91107
21
22 ;
23 y b;
24
25
foo()26 int foo() {
27 y a = x;
28 return x + a;
29 }
30
31