Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

2020-12-15 15:52:33 -07:00
parent 6c5c22ea8e be3e823608
commit 41bee49d07
4649 changed files with 1311795 additions and 0 deletions
--- a/lib/vscode/extensions/merge-conflict/src/mergeConflictMain.ts
+++ b/lib/vscode/extensions/merge-conflict/src/mergeConflictMain.ts
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import MergeConflictServices from './services';
+
+export function activate(context: vscode.ExtensionContext) {
+	// Register disposables
+	const services = new MergeConflictServices(context);
+	services.begin();
+	context.subscriptions.push(services);
+}
+
+export function deactivate() {
+}
+