add git.experimental.mergeEditor setting to enable/disable merge editor for conflicting files

2026-04-24 18:49:00 +01:00 · 2022-05-25 17:08:15 +02:00
parent 1ed660b17e
commit 38931b6a3d
3 changed files with 32 additions and 12 deletions
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -2445,6 +2445,12 @@
          ],
          "markdownDescription": "%config.logLevel%",
          "scope": "window"
+        },
+        "git.experimental.mergeEditor": {
+          "type": "boolean",
+          "default": false,
+          "markdownDescription": "%config.experimental.mergeEditor%",
+          "scope": "window"
        }
      }
    },