From 21a2eca3b7acd124731087feb0fffdeba56ecf20 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 16 Sep 2022 11:55:06 +0200
Subject: [PATCH] The `openMergeEditor` command should check the active tab
 when it is called without an URI (#161072)

https://github.com/microsoft/vscode/issues/160924
---
 extensions/git/src/commands.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index d485a83c7c4..1419f3d8cac 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -445,6 +445,12 @@ export class CommandCenter {
 
 	@command('git.openMergeEditor')
 	async openMergeEditor(uri: unknown) {
+		if (uri === undefined) {
+			// fallback to active editor...
+			if (window.tabGroups.activeTabGroup.activeTab?.input instanceof TabInputText) {
+				uri = window.tabGroups.activeTabGroup.activeTab.input.uri;
+			}
+		}
 		if (!(uri instanceof Uri)) {
 			return;
 		}