Skip to content

Commit 3aa87ad

Browse files
authored
merge editor - fix URI check for view state (microsoft#153416)
1 parent e775136 commit 3aa87ad

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
459459
}
460460

461461
protected computeEditorViewState(resource: URI): IMergeEditorViewState | undefined {
462-
if (isEqual(this.model?.result.uri, resource)) {
462+
if (!isEqual(this.model?.result.uri, resource)) {
463463
// TODO@bpasero Why not check `input#resource` and don't ask me for "forgein" resources?
464464
return undefined;
465465
}

0 commit comments

Comments
 (0)