Disable overrides in sync merge fixes #127328
This commit is contained in:
parent
0cf9052553
commit
2bc0be35b8
1 changed files with 3 additions and 1 deletions
|
@ -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
|
||||
},
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue