Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

extensions/merge-conflict/extension.webpack.config.js

@@ -12,6 +12,9 @@ const withDefaults = require('../shared.webpack.config');
 module.exports = withDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/extension.ts'
-	}
+		extension: './src/mergeConflictMain.ts'
+	},
+	output: {
+		filename: 'mergeConflictMain.js'
+	},
 });