maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Disable overrides in sync merge fixes #127328

Browse source
This commit is contained in:
Logan Ramos 2021-06-30 12:46:54 -04:00
parent 0cf9052553
commit 2bc0be35b8
No known key found for this signature in database
GPG key ID: D9CCFF14F0B18183
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts
View file

@ -38,6 +38,7 @@ import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
import { Severity } from 'vs/platform/notification/common/notification';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { EditorOverride } from 'vs/platform/editor/common/editor';
export class UserDataSyncMergesViewPane extends TreeViewPane {
@ -322,7 +323,8 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
options: {
preserveFocus: true,
revealIfVisible: true,
pinned: true
pinned: true,
override: EditorOverride.DISABLED
},
});
}