We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent e775136 commit 3aa87adCopy full SHA for 3aa87ad
src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
@@ -459,7 +459,7 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
459
}
460
461
protected computeEditorViewState(resource: URI): IMergeEditorViewState | undefined {
462
- if (isEqual(this.model?.result.uri, resource)) {
+ if (!isEqual(this.model?.result.uri, resource)) {
463
// TODO@bpasero Why not check `input#resource` and don't ask me for "forgein" resources?
464
return undefined;
465
0 commit comments