Merge branch 'master' into git-ext-strict

This commit is contained in:
João Moreno
2017-11-08 10:36:28 +01:00
committed by GitHub
434 changed files with 2110 additions and 2505 deletions

View File

@@ -6,7 +6,6 @@
'use strict';
import 'mocha';
import { GitStatusParser } from '../git';
import * as assert from 'assert';

View File

@@ -4,4 +4,4 @@
*--------------------------------------------------------------------------------------------*/
/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>