This website requires JavaScript.
Explore
Help
Register
Sign In
microsoft
/
TypeScript
Watch
1
Star
0
Fork
0
You've already forked TypeScript
mirror of
https://github.com/microsoft/TypeScript.git
synced
2026-06-19 22:07:42 -05:00
Code
Issues
Packages
Projects
Releases
212
Wiki
Activity
Files
a13af6b4821917d1195bf0ef97239fa3ddb48779
TypeScript
/
tests
/
cases
History
Cyrus Najmabadi
a1d04c3c65
Merge branch 'master' into mergeMarkers1
2014-12-28 18:58:47 -08:00
..
compiler
Merge branch 'master' into mergeMarkers1
2014-12-28 18:58:47 -08:00
conformance
…
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
