diff options
Diffstat (limited to 'src/vs/workbench/services/workspaces/common/workspaceTrust.ts')
| -rw-r--r-- | src/vs/workbench/services/workspaces/common/workspaceTrust.ts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts index e464de637ee..16b1dff68d9 100644 --- a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts +++ b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts @@ -224,6 +224,10 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork filesToOpen.push(...this.environmentService.filesToDiff); } + if (this.environmentService.filesToMerge) { + filesToOpen.push(...this.environmentService.filesToMerge); + } + if (filesToOpen.length) { const filesToOpenOrCreateUris = filesToOpen.filter(f => !!f.fileUri).map(f => f.fileUri!); const canonicalFilesToOpen = await Promise.all(filesToOpenOrCreateUris.map(uri => this.getCanonicalUri(uri))); |