Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

enable merge editor by default (#155937)

Browse Source
This commit is contained in:
Johannes Rieken
2022-07-22 11:28:49 +02:00
committed by GitHub
parent cf0496267d
commit b8876a2d60
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/git/package.json
View File

@@ -2522,7 +2522,7 @@
},
"git.mergeEditor": {
"type": "boolean",
"default": false,
"default": true,
"markdownDescription": "%config.mergeEditor%",
"scope": "window"
}