Register content provider (again) (fixes #40557)

extensions/merge-conflict/src/contentProvider.ts

@@ -9,6 +9,15 @@ export default class MergeConflictContentProvider implements vscode.TextDocument
 
 	static scheme = 'merge-conflict.conflict-diff';
 
+	constructor(private context: vscode.ExtensionContext) {
+	}
+
+	begin() {
+		this.context.subscriptions.push(
+			vscode.workspace.registerTextDocumentContentProvider(MergeConflictContentProvider.scheme, this)
+		);
+	}
+
 	dispose() {
 	}
 

extensions/merge-conflict/src/services.ts

@@ -28,7 +28,7 @@ export default class ServiceWrapper implements vscode.Disposable {
 			documentTracker,
 			new CommandHandler(documentTracker),
 			new CodeLensProvider(documentTracker),
-			new ContentProvider(),
+			new ContentProvider(this.context),
 			new Decorator(this.context, documentTracker),
 		);