support merge code lens for vscode-userdata

mkenigs · Sep 20, 2019 · 81ec777 · 81ec777
1 parent c04457c
commit 81ec777
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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);
 	}
 }