microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-10 01:43:59 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Update conflict marker formatting test. We now no longer format the second branch of hte merge.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2014-12-19 11:33:45 -08:00
parent ff9f59c913
commit 0707350c7b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cases/fourslash/formatConflictMarker1.ts
View File

@@ -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\
}");