@codingame/monaco-vscode-merge-conflict-default-extension 26.2.2 → 28.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/resources/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"merge-conflict","publisher":"vscode","displayName":"%displayName%","description":"%description%","icon":"media/icon.png","version":"
|
|
1
|
+
{"name":"merge-conflict","publisher":"vscode","displayName":"%displayName%","description":"%description%","icon":"media/icon.png","version":"10.0.0","license":"MIT","aiKey":"0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255","engines":{"vscode":"^1.5.0"},"categories":["Other"],"capabilities":{"virtualWorkspaces":true,"untrustedWorkspaces":{"supported":true}},"activationEvents":["onStartupFinished"],"main":"./dist/mergeConflictMain","browser":"./dist/browser/mergeConflictMain","contributes":{"commands":[{"category":"%command.category%","title":"%command.accept.all-current%","original":"Accept All Current","command":"merge-conflict.accept.all-current","enablement":"!isMergeEditor"},{"category":"%command.category%","title":"%command.accept.all-incoming%","original":"Accept All Incoming","command":"merge-conflict.accept.all-incoming","enablement":"!isMergeEditor"},{"category":"%command.category%","title":"%command.accept.all-both%","original":"Accept All Both","command":"merge-conflict.accept.all-both","enablement":"!isMergeEditor"},{"category":"%command.category%","title":"%command.accept.current%","original":"Accept Current","command":"merge-conflict.accept.current","enablement":"!isMergeEditor"},{"category":"%command.category%","title":"%command.accept.incoming%","original":"Accept Incoming","command":"merge-conflict.accept.incoming","enablement":"!isMergeEditor"},{"category":"%command.category%","title":"%command.accept.selection%","original":"Accept Selection","command":"merge-conflict.accept.selection","enablement":"!isMergeEditor"},{"category":"%command.category%","title":"%command.accept.both%","original":"Accept Both","command":"merge-conflict.accept.both","enablement":"!isMergeEditor"},{"category":"%command.category%","title":"%command.next%","original":"Next Conflict","command":"merge-conflict.next","enablement":"!isMergeEditor","icon":"$(arrow-down)"},{"category":"%command.category%","title":"%command.previous%","original":"Previous Conflict","command":"merge-conflict.previous","enablement":"!isMergeEditor","icon":"$(arrow-up)"},{"category":"%command.category%","title":"%command.compare%","original":"Compare Current Conflict","command":"merge-conflict.compare","enablement":"!isMergeEditor"}],"menus":{"scm/resourceState/context":[{"command":"merge-conflict.accept.all-current","when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification"},{"command":"merge-conflict.accept.all-incoming","when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification"}],"editor/title":[{"command":"merge-conflict.previous","group":"navigation@1","when":"!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0"},{"command":"merge-conflict.next","group":"navigation@2","when":"!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0"}]},"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","description":"%config.codeLensEnabled%","default":true},"merge-conflict.decorators.enabled":{"type":"boolean","description":"%config.decoratorsEnabled%","default":true},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","description":"%config.autoNavigateNextConflictEnabled%","default":false},"merge-conflict.diffViewPosition":{"type":"string","enum":["Current","Beside","Below"],"description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"],"default":"Current"}}}},"repository":{"type":"git","url":"https://github.com/microsoft/vscode.git"}}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
/*!
|
|
2
|
-
* NevWare21 Solutions LLC - ts-async, 0.5.4
|
|
3
|
-
* https://github.com/nevware21/ts-async
|
|
4
|
-
* Copyright (c) NevWare21 Solutions LLC and contributors. All rights reserved.
|
|
5
|
-
* Licensed under the MIT license.
|
|
6
|
-
*/
|
|
7
|
-
|
|
8
|
-
/*! https://github.com/nevware21/ts-utils v0.11.6 */
|