@@ -11,7 +11,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
11
11
import { EditorPaneDescriptor , IEditorPaneRegistry } from 'vs/workbench/browser/editor' ;
12
12
import { Extensions as WorkbenchExtensions , IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions' ;
13
13
import { EditorExtensions , IEditorFactoryRegistry } from 'vs/workbench/common/editor' ;
14
- import { AcceptAllInput1 , AcceptAllInput2 , AcceptMerge , CompareInput1WithBaseCommand , CompareInput2WithBaseCommand , GoToNextUnhandledConflict , GoToPreviousUnhandledConflict , OpenBaseFile , OpenMergeEditor , OpenResultResource , ResetDirtyConflictsToBaseCommand , ResetToBaseAndAutoMergeCommand , SetColumnLayout , SetMixedLayout , ShowHideAtTopBase , ShowHideBase , ShowNonConflictingChanges , ToggleActiveConflictInput1 , ToggleActiveConflictInput2 } from 'vs/workbench/contrib/mergeEditor/browser/commands/commands' ;
14
+ import { AcceptAllInput1 , AcceptAllInput2 , AcceptMerge , CompareInput1WithBaseCommand , CompareInput2WithBaseCommand , GoToNextUnhandledConflict , GoToPreviousUnhandledConflict , OpenBaseFile , OpenMergeEditor , OpenResultResource , ResetToBaseAndAutoMergeCommand , SetColumnLayout , SetMixedLayout , ShowHideAtTopBase , ShowHideBase , ShowNonConflictingChanges , ToggleActiveConflictInput1 , ToggleActiveConflictInput2 } from 'vs/workbench/contrib/mergeEditor/browser/commands/commands' ;
15
15
import { MergeEditorCopyContentsToJSON , MergeEditorLoadContentsFromFolder , MergeEditorSaveContentsToFolder } from 'vs/workbench/contrib/mergeEditor/browser/commands/devCommands' ;
16
16
import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput' ;
17
17
import { MergeEditor , MergeEditorOpenHandlerContribution , MergeEditorResolverContribution } from 'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor' ;
@@ -70,7 +70,6 @@ registerAction2(AcceptAllInput1);
70
70
registerAction2 ( AcceptAllInput2 ) ;
71
71
72
72
registerAction2 ( ResetToBaseAndAutoMergeCommand ) ;
73
- registerAction2 ( ResetDirtyConflictsToBaseCommand ) ;
74
73
75
74
registerAction2 ( AcceptMerge ) ;
76
75
@@ -86,23 +85,3 @@ Registry
86
85
Registry
87
86
. as < IWorkbenchContributionsRegistry > ( WorkbenchExtensions . Workbench )
88
87
. registerWorkbenchContribution ( MergeEditorResolverContribution , LifecyclePhase . Starting ) ;
89
- /*
90
- class MergeEditorWorkbenchContribution extends Disposable implements IWorkbenchContribution {
91
- constructor(@IWorkingCopyEditorService private readonly _workingCopyEditorService: IWorkingCopyEditorService) {
92
- super();
93
-
94
- this._register(
95
- _workingCopyEditorService.registerHandler({
96
- createEditor(workingCopy) {
97
- throw new BugIndicatingError('not supported');
98
- },
99
- handles(workingCopy) {
100
- return workingCopy.typeId === '';
101
- },
102
- isOpen(workingCopy, editor) {
103
- return workingCopy.resource.toString() === that._model?.resultTextModel.uri.toString();
104
- },
105
- }));
106
- }
107
- }
108
- */
0 commit comments