From 65cbb9324b91f75eb283bda86a4eb3551b3ccdf7 Mon Sep 17 00:00:00 2001
From: Isidor Nikolic <inikolic@microsoft.com>
Date: Wed, 14 Sep 2022 20:41:41 +0200
Subject: [PATCH] change git.mergeEditor setting to be false (#160923)

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

diff --git a/extensions/git/package.json b/extensions/git/package.json
index b86fa779cf6..89287db3dec 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -2576,7 +2576,7 @@
         },
         "git.mergeEditor": {
           "type": "boolean",
-          "default": true,
+          "default": false,
           "markdownDescription": "%config.mergeEditor%",
           "scope": "window"
         }