Skip to content

Commit f1d4fce

Browse files
authored
1 parent f8ba335 commit f1d4fce

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ export class ConflictActionsFactory extends Disposable {
8686
}
8787

8888
const items = derived('items', reader => {
89+
if (!viewModel.model.hasBaseRange(modifiedBaseRange)) {
90+
return [];
91+
}
92+
8993
const state = viewModel.model.getState(modifiedBaseRange).read(reader);
9094
const handled = viewModel.model.isHandled(modifiedBaseRange).read(reader);
9195
const model = viewModel.model;

0 commit comments

Comments
 (0)