microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-11 05:30:03 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Disable merge-conflict commands for 3wm-editor (#161304)

Browse Source 
fixes https://github.com/microsoft/vscode/issues/159156
This commit is contained in:
Johannes Rieken
2022-09-20 13:50:21 +02:00
committed by GitHub
parent ba7d2622c6
commit c1b80f6402
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/merge-conflict/package.json
View File

@@ -34,43 +34,50 @@
"category": "%command.category%",
"title": "%command.accept.all-current%",
"original": "Accept All Current",
"command": "merge-conflict.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"
"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"
"command": "merge-conflict.accept.all-both",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.current%",
"original": "Accept Current",
"command": "merge-conflict.accept.current"
"command": "merge-conflict.accept.current",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.incoming%",
"original": "Accept Incoming",
"command": "merge-conflict.accept.incoming"
"command": "merge-conflict.accept.incoming",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.selection%",
"original": "Accept Selection",
"command": "merge-conflict.accept.selection"
"command": "merge-conflict.accept.selection",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
"title": "%command.accept.both%",
"original": "Accept Both",
"command": "merge-conflict.accept.both"
"command": "merge-conflict.accept.both",
"enablement": "!isMergeEditor"
},
{
"category": "%command.category%",
@@ -92,7 +99,8 @@
"category": "%command.category%",
"title": "%command.compare%",
"original": "Compare Current Conflict",
"command": "merge-conflict.compare"
"command": "merge-conflict.compare",
"enablement": "!isMergeEditor"
}
],
"menus": {