From fa9d70718cd417fbb4b345a93f1aaec946bddb4b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Mon, 27 Jun 2016 14:57:19 +0200
Subject: [PATCH] do not open an editor when editing a diff editor

---
 src/vs/workbench/common/editor/editorStacksModel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/common/editor/editorStacksModel.ts b/src/vs/workbench/common/editor/editorStacksModel.ts
index 287e76b2a18..ade6d47a83d 100644
--- a/src/vs/workbench/common/editor/editorStacksModel.ts
+++ b/src/vs/workbench/common/editor/editorStacksModel.ts
@@ -515,7 +515,7 @@ export class EditorGroup implements IEditorGroup {
 	}
 
 	private updateResourceMap(editor: EditorInput, remove: boolean): void {
-		const resource = getUntitledOrFileResource(editor);
+		const resource = getUntitledOrFileResource(editor, true /* include diff editors */);
 		if (resource) {
 			this.mapResourceToEditor[resource.toString()] = remove ? void 0 : editor;
 		}