Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/vs/platform/environment/common/argv.ts')
-rw-r--r--src/vs/platform/environment/common/argv.ts2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index 0e8ccc14714..5424707ace6 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -18,6 +18,7 @@ export interface NativeParsedArgs {
wait?: boolean;
waitMarkerFilePath?: string;
diff?: boolean;
+ merge?: boolean;
add?: boolean;
goto?: boolean;
'new-window'?: boolean;
@@ -89,6 +90,7 @@ export interface NativeParsedArgs {
'logsPath'?: string;
'__enable-file-policy'?: boolean;
editSessionId?: string;
+ 'shell-integration'?: string;
// chromium command line args: https://electronjs.org/docs/all#supported-chrome-command-line-switches
'no-proxy-server'?: boolean;