Fixes microsoft#158289 (microsoft#158350)

hediet · web-flow · commit d272040854f2 · 2022-08-17T11:20:48.000+02:00
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -197,6 +197,11 @@ export const tocData: ITOCEntry<string> = {
 					id: 'features/audioCues',
 					label: localize('audioCues', 'Audio Cues'),
 					settings: ['audioCues.*']
+				},
+				{
+					id: 'features/mergeEditor',
+					label: localize('mergeEditor', 'Merge Editor'),
+					settings: ['mergeEditor.*']
 				}
 			]
 		},

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,11 @@ export const tocData: ITOCEntry<string> = {`
`197`	`197`	`id: 'features/audioCues',`
`198`	`198`	`label: localize('audioCues', 'Audio Cues'),`
`199`	`199`	`settings: ['audioCues.*']`
	`200`	`+ },`
	`201`	`+ {`
	`202`	`+ id: 'features/mergeEditor',`
	`203`	`+ label: localize('mergeEditor', 'Merge Editor'),`
	`204`	`+ settings: ['mergeEditor.*']`
`200`	`205`	`}`
`201`	`206`	`]`
`202`	`207`	`},`