vscodium: enable mergeEditor

Stunkymonkey · Sep 10, 2024 · 1074fc3 · 1074fc3
1 parent fb5b17a
commit 1074fc3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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
 }