vscodium: enable mergeEditor

This commit is contained in:
Felix Buehler 2024-09-10 21:00:08 +02:00
parent fb5b17a5e1
commit 1074fc3260

View file

@ -17,5 +17,6 @@
"editor.guides.bracketPairs": "active", "editor.guides.bracketPairs": "active",
"window.commandCenter": true, "window.commandCenter": true,
"workbench.iconTheme": "material-icon-theme", "workbench.iconTheme": "material-icon-theme",
"git.openRepositoryInParentFolders": "always" "git.openRepositoryInParentFolders": "always",
"git.mergeEditor": true
} }