Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

2026-02-16 10:58:30 -05:00 · 2019-09-24 21:36:17 -07:00
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions
--- a/extensions/merge-conflict/src/codelensProvider.ts
+++ b/extensions/merge-conflict/src/codelensProvider.ts
@@ -100,6 +100,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
 		this.codeLensRegistrationHandle = vscode.languages.registerCodeLensProvider([
 			{ scheme: 'file' },
 			{ scheme: 'untitled' },
+			{ scheme: 'vscode-userdata' },
 		], this);
 	}
 }