41 lines · c
1// RUN: %clang_cc1 %s -verify -fsyntax-only2 3// Test that we recover gracefully from conflict markers left in input files.4// PR52385 6// diff3 style expected-error@+1 {{version control conflict marker in file}}7<<<<<<< .mine8int x = 4;9|||||||10int x = 123;11=======12float x = 17;13>>>>>>> .r9110714 15// normal style expected-error@+1 {{version control conflict marker in file}}16<<<<<<< .mine17typedef int y;18=======19typedef struct foo *y;20>>>>>>> .r9110721 22// Perforce style expected-error@+1 {{version control conflict marker in file}}23>>>> ORIGINAL conflict-marker.c#624int z = 1;25==== THEIRS conflict-marker.c#726int z = 0;27==== YOURS conflict-marker.c28int z = 2;29<<<<30 31;32y b;33 34 35int foo(void) {36 y a = x;37 return x + a - z;38}39 40<<<<<<<>>>>>>> // expected-error {{expected identifier}}41