conflict-marker.c revision a5728872c7702ddd09537c95bc3cbd20e1f2fb09 
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}}
8int x = 4;
9|||||||
10int x = 123;
11=======
12float x = 17;
13>>>>>>> .r91107
14
15// normal style.
16<<<<<<< .mine             // expected-error {{version control conflict marker in file}}
17typedef int y;
18=======
19typedef struct foo *y;
20>>>>>>> .r91107
21
22;
23y b;
24
25int foo() {
26  y a = x;
27  return x + a;
28}
29
30