vscodium: enable mergeEditor

Stunkymonkey · Stunkymonkey · commit 1074fc32601b · 2024-09-10T21:00:08.000+02:00
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
 }

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@`
`17`	`17`	`"editor.guides.bracketPairs": "active",`
`18`	`18`	`"window.commandCenter": true,`
`19`	`19`	`"workbench.iconTheme": "material-icon-theme",`
`20`		`- "git.openRepositoryInParentFolders": "always"`
	`20`	`+ "git.openRepositoryInParentFolders": "always",`
	`21`	`+ "git.mergeEditor": true`
`21`	`22`	`}`