From 828b33aae7d7262cb40cfb0a35ef2bef6a37b051 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 18 Dec 2014 17:23:34 -0800
Subject: [PATCH] Add test demonstrating the problem with conflict markers.

---
 .../conflictMarkerTrivia2.errors.txt          | 43 +++++++++++++++++++
 tests/cases/compiler/conflictMarkerTrivia2.ts | 12 ++++++
 2 files changed, 55 insertions(+)
 create mode 100644 tests/baselines/reference/conflictMarkerTrivia2.errors.txt
 create mode 100644 tests/cases/compiler/conflictMarkerTrivia2.ts

diff --git a/tests/baselines/reference/conflictMarkerTrivia2.errors.txt b/tests/baselines/reference/conflictMarkerTrivia2.errors.txt
new file mode 100644
index 00000000000..7dec00327f2
--- /dev/null
+++ b/tests/baselines/reference/conflictMarkerTrivia2.errors.txt
@@ -0,0 +1,43 @@
+tests/cases/compiler/conflictMarkerTrivia2.ts(3,1): error TS1185: Merge conflict marker encountered.
+tests/cases/compiler/conflictMarkerTrivia2.ts(4,6): error TS2304: Cannot find name 'a'.
+tests/cases/compiler/conflictMarkerTrivia2.ts(6,1): error TS1185: Merge conflict marker encountered.
+tests/cases/compiler/conflictMarkerTrivia2.ts(7,6): error TS2391: Function implementation is missing or not immediately following the declaration.
+tests/cases/compiler/conflictMarkerTrivia2.ts(9,1): error TS1185: Merge conflict marker encountered.
+tests/cases/compiler/conflictMarkerTrivia2.ts(11,3): error TS1128: Declaration or statement expected.
+tests/cases/compiler/conflictMarkerTrivia2.ts(11,10): error TS2304: Cannot find name 'bar'.
+tests/cases/compiler/conflictMarkerTrivia2.ts(11,16): error TS1005: ';' expected.
+tests/cases/compiler/conflictMarkerTrivia2.ts(12,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/compiler/conflictMarkerTrivia2.ts (9 errors) ====
+    class C {
+      foo() {
+    <<<<<<< B
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+         a();
+         ~
+!!! error TS2304: Cannot find name 'a'.
+      }
+    =======
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+         b();
+         ~
+!!! error TS2391: Function implementation is missing or not immediately following the declaration.
+      }
+    >>>>>>> A
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+    
+      public bar() { }
+      ~~~~~~
+!!! error TS1128: Declaration or statement expected.
+             ~~~
+!!! error TS2304: Cannot find name 'bar'.
+                   ~
+!!! error TS1005: ';' expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
+    
\ No newline at end of file
diff --git a/tests/cases/compiler/conflictMarkerTrivia2.ts b/tests/cases/compiler/conflictMarkerTrivia2.ts
new file mode 100644
index 00000000000..d40574c6e5f
--- /dev/null
+++ b/tests/cases/compiler/conflictMarkerTrivia2.ts
@@ -0,0 +1,12 @@
+class C {
+  foo() {
+<<<<<<< B
+     a();
+  }
+=======
+     b();
+  }
+>>>>>>> A
+
+  public bar() { }
+}