From 81ec777df28802e3bfe7e8c7ae45f0b7e5dde994 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 20 Sep 2019 22:09:16 +0200
Subject: [PATCH] support merge code lens for vscode-userdata

---
 extensions/merge-conflict/src/codelensProvider.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/merge-conflict/src/codelensProvider.ts b/extensions/merge-conflict/src/codelensProvider.ts
index 6ee4f2f043b..ce10e484c85 100644
--- 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);
 	}
 }
-- 
GitLab