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

2014-12-19 11:33:45 -08:00

..

compiler

Add test demonstrating the problem with conflict markers.

2014-12-18 17:23:34 -08:00

conformance

Merge branch 'master' into spreadAndRest

2014-12-17 11:49:45 -08:00

fourslash

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

2014-12-19 11:33:45 -08:00

fourslash_old

…

project

…

projects

…

test262-harness

…

unittests

Provide better error recovery when we encounter merge markers in the source.

2014-12-18 19:18:13 -08:00