diff options
Diffstat (limited to 'src/vs/server/node/server.cli.ts')
| -rw-r--r-- | src/vs/server/node/server.cli.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts index d38bd7ee8e5..56a704050b3 100644 --- a/src/vs/server/node/server.cli.ts +++ b/src/vs/server/node/server.cli.ts @@ -44,6 +44,7 @@ const isSupportedForCmd = (optionId: keyof RemoteParsedArgs) => { case 'enable-smoke-test-driver': case 'extensions-download-dir': case 'builtin-extensions-dir': + case 'shell-integration': case 'telemetry': return false; default: @@ -59,6 +60,7 @@ const isSupportedForPipe = (optionId: keyof RemoteParsedArgs) => { case 'file-uri': case 'add': case 'diff': + case 'merge': case 'wait': case 'goto': case 'reuse-window': @@ -297,6 +299,7 @@ export function main(desc: ProductDescription, args: string[]): void { fileURIs, folderURIs, diffMode: parsedArgs.diff, + mergeMode: parsedArgs.merge, addMode: parsedArgs.add, gotoLineMode: parsedArgs.goto, forceReuseWindow: parsedArgs['reuse-window'], |