Merge branch 'master' into scm-api

This commit is contained in:
Joao Moreno
2016-12-05 17:33:47 +01:00
241 changed files with 4229 additions and 2484 deletions

View File

@@ -21,7 +21,7 @@ class TextDocumentContentProvider {
constructor(private git: Git, private rootPath: string) { }
async provideTextDocumentContent(uri: Uri): Promise<string> {
const relativePath = path.relative(this.rootPath, uri.fsPath);
const relativePath = path.relative(this.rootPath, uri.fsPath).replace(/\\/g, '/');
try {
const result = await this.git.exec(this.rootPath, ['show', `HEAD:${relativePath}`]);