From 0707350c7bcd41a7b0b30b1d71aaf43d8bfc2718 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 19 Dec 2014 11:33:45 -0800
Subject: [PATCH] Update conflict marker formatting test.  We now no longer
 format the second branch of hte merge.

---
 tests/cases/fourslash/formatConflictMarker1.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cases/fourslash/formatConflictMarker1.ts b/tests/cases/fourslash/formatConflictMarker1.ts
index 88c97032411..c0e2dbc4f69 100644
--- a/tests/cases/fourslash/formatConflictMarker1.ts
+++ b/tests/cases/fourslash/formatConflictMarker1.ts
@@ -2,7 +2,7 @@
 
 ////class C {
 ////<<<<<<< HEAD
-////    v = 1;
+////v = 1;
 ////=======
 ////v = 2;
 ////>>>>>>> Branch - a
@@ -13,6 +13,6 @@ verify.currentFileContentIs("class C {\r\n\
 <<<<<<< HEAD\r\n\
     v = 1;\r\n\
 =======\r\n\
-    v = 2;\r\n\
+v = 2;\r\n\
 >>>>>>> Branch - a\r\n\
 }");
\ No newline at end of file