Fixed old sys dependency, as sys is now ts.sys.
Remove baselines.
Re-add baselines.
Make the compiler resilient to encountering merge conflict markers in a source code file.
Adding classification test.
CR feedback.
For 262 tests, emit a bit in the baseline stating if the node had an error or not.
Merge pull request #1458 from Microsoft/test262ErrorBit

For 262 tests, emit a bit in the baseline stating if the node had an error or not.
Merge pull request #1456 from Microsoft/mergeMarkers

Make the compiler resilient to encountering merge conflict markers in a source code file.
remove trailing comma
Just temporarily removing the tests until we can get back into a good state.
Merge pull request #1453 from Microsoft/fixSysDependencyForDiagnostics

Fix sys dependency for processDiagnosticMessages.ts
Merge branch 'release-1.4' into fixProcessDiagMessagesProbWith1.4Merge

Conflicts:
	tests/baselines/reference/APISample_node_compile.js
	tests/baselines/reference/APISample_node_compile.types
	tests/baselines/reference/APISample_standalone_compile.js
	tests/baselines/reference/APISample_standalone_compile.types
	tests/cases/compiler/APISample_node_compile.ts
	tests/cases/compiler/APISample_standalone_compile.ts
Merge pull request #1461 from Microsoft/fixProcessDiagMessagesProbWith1.4Merge

Fix processDiagnosticMessages script issue in master with a 1.4 merge
Merge branch 'master' into sourceFileUpdate

Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/parser.ts
	tests/baselines/reference/APISample_node_compile.js
	tests/baselines/reference/APISample_node_compile.types
	tests/baselines/reference/APISample_standalone_compile.js
	tests/baselines/reference/APISample_standalone_compile.types