change git.mergeEditor default setting (microsoft#160925)

isidorn · web-flow · commit d8ca332ee97e · 2022-09-14T13:08:15.000-07:00
fixes microsoft#160806
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -2544,7 +2544,7 @@
         },
         "git.mergeEditor": {
           "type": "boolean",
-          "default": true,
+          "default": false,
           "markdownDescription": "%config.mergeEditor%",
           "scope": "window"
         }

Original file line number	Diff line number	Diff line change
`@@ -2544,7 +2544,7 @@`
`2544`	`2544`	`},`
`2545`	`2545`	`"git.mergeEditor": {`
`2546`	`2546`	`"type": "boolean",`
`2547`		`- "default": true,`
	`2547`	`+ "default": false,`
`2548`	`2548`	`"markdownDescription": "%config.mergeEditor%",`
`2549`	`2549`	`"scope": "window"`
`2550`	`2550`	`}`