From 1074fc32601b739935a5cd42c9d77b75402e6a7f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 10 Sep 2024 21:00:08 +0200
Subject: [PATCH] vscodium: enable mergeEditor

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

diff --git a/vscodium/settings.json b/vscodium/settings.json
index 9fb1d9c..ef0514c 100644
--- a/vscodium/settings.json
+++ b/vscodium/settings.json
@@ -17,5 +17,6 @@
     "editor.guides.bracketPairs": "active",
     "window.commandCenter": true,
     "workbench.iconTheme": "material-icon-theme",
-    "git.openRepositoryInParentFolders": "always"
+    "git.openRepositoryInParentFolders": "always",
+    "git.mergeEditor": true
 }