From da29a245ffbfb4e957b0dee078464fb75f68c312 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyceerhl@gmail.com>
Date: Tue, 8 Feb 2022 00:28:04 -0800
Subject: [PATCH] Enable merge-conflict extension in virtual workspaces (fixes
 #142447)

---
 extensions/merge-conflict/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index 942abb0ce9f..3aa6b16014d 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -14,7 +14,7 @@
     "Other"
   ],
   "capabilities": {
-    "virtualWorkspaces": false,
+    "virtualWorkspaces": true,
     "untrustedWorkspaces": {
       "supported": true
     }