From 1b02c5c3bdfd4e6133e30c87e0d86b92fc3b16da Mon Sep 17 00:00:00 2001
From: Wilfried OLLIVIER <wollivier@fdn.fr>
Date: Thu, 11 Aug 2022 00:13:31 +0200
Subject: [PATCH] Update vscode git config

---
 settings.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/settings.json b/settings.json
index d39d620..f1fb903 100644
--- a/settings.json
+++ b/settings.json
@@ -186,6 +186,8 @@
     "suppressNoRepositoryWarning": false
   },
   "gitlens.keymap": "alternate",
+  "githubPullRequests.pullBranch": "never",
+  "git.mergeEditor": false,
   "Lua.telemetry.enable": false,
   "go.toolsManagement.autoUpdate": true,
   "go.formatTool": "goimports",
@@ -242,5 +244,4 @@
   "emmet.includeLanguages": {
     "erb": "html"
   },
-  "githubPullRequests.pullBranch": "never"
 }