improve matches method

microsoft · Jul 18, 2022 · 972decd · 972decd
1 parent abe9324
commit 972decd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts
@@ -157,7 +157,8 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput implements
 				&& isEqual(this.result, otherInput.result);
 		}
 		if (isResourceMergeEditorInput(otherInput)) {
-			return isEqual(this.base, otherInput.base.resource)
+			return this.editorId === otherInput.options?.override
+				&& isEqual(this.base, otherInput.base.resource)
 				&& isEqual(this.input1.uri, otherInput.input1.resource)
 				&& isEqual(this.input2.uri, otherInput.input2.resource)
 				&& isEqual(this.result, otherInput.result.resource);