diff options
Diffstat (limited to 'src/vs/platform/launch/electron-main/launchMainService.ts')
| -rw-r--r-- | src/vs/platform/launch/electron-main/launchMainService.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/vs/platform/launch/electron-main/launchMainService.ts b/src/vs/platform/launch/electron-main/launchMainService.ts index 79bbb3ccde9..ea6c6a68274 100644 --- a/src/vs/platform/launch/electron-main/launchMainService.ts +++ b/src/vs/platform/launch/electron-main/launchMainService.ts @@ -190,6 +190,7 @@ export class LaunchMainService implements ILaunchMainService { preferNewWindow: !args['reuse-window'] && !args.wait, forceReuseWindow: args['reuse-window'], diffMode: args.diff, + mergeMode: args.merge, addMode: args.add, noRecentEntry: !!args['skip-add-to-recently-opened'], gotoLineMode: args.goto |