mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
change git.mergeEditor setting to be false (#160923)
This commit is contained in:
parent
e97b478d06
commit
65cbb9324b
|
@ -2576,7 +2576,7 @@
|
|||
},
|
||||
"git.mergeEditor": {
|
||||
"type": "boolean",
|
||||
"default": true,
|
||||
"default": false,
|
||||
"markdownDescription": "%config.mergeEditor%",
|
||||
"scope": "window"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue