mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-27 03:54:24 +01:00
change git.mergeEditor setting to be false (#160923)
This commit is contained in:
@@ -2576,7 +2576,7 @@
|
||||
},
|
||||
"git.mergeEditor": {
|
||||
"type": "boolean",
|
||||
"default": true,
|
||||
"default": false,
|
||||
"markdownDescription": "%config.mergeEditor%",
|
||||
"scope": "window"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user