diff options
Diffstat (limited to 'src/vs/platform/environment/node/argv.ts')
-rw-r--r-- | src/vs/platform/environment/node/argv.ts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index e27a89390c2..c3583c85e1a 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -41,6 +41,7 @@ type OptionTypeName<T> = export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = { 'diff': { type: 'boolean', cat: 'o', alias: 'd', args: ['file', 'file'], description: localize('diff', "Compare two files with each other.") }, + 'merge': { type: 'boolean', cat: 'o', alias: 'm', args: ['path1', 'path2', 'base', 'result'], description: localize('merge', "Perform a three-way merge by providing paths for two modified versions of a file, the common origin of both modified versions and the output file to save merge results.") }, 'add': { type: 'boolean', cat: 'o', alias: 'a', args: 'folder', description: localize('add', "Add folder(s) to the last active window.") }, 'goto': { type: 'boolean', cat: 'o', alias: 'g', args: 'file:line[:character]', description: localize('goto', "Open a file at the path on the specified line and character position.") }, 'new-window': { type: 'boolean', cat: 'o', alias: 'n', description: localize('newWindow', "Force to open a new window.") }, @@ -127,6 +128,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = { 'logsPath': { type: 'string' }, '__enable-file-policy': { type: 'boolean' }, 'editSessionId': { type: 'string' }, + 'shell-integration': { type: 'string', args: ['bash', 'pwsh', 'zsh'] }, // chromium flags 'no-proxy-server': { type: 'boolean' }, |