mirror of
https://github.com/Stunkymonkey/dotfiles.git
synced 2025-05-24 11:04:41 +02:00
vscodium: enable mergeEditor
This commit is contained in:
parent
fb5b17a5e1
commit
1074fc3260
1 changed files with 2 additions and 1 deletions
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue