mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-25 11:08:51 +01:00
18 lines
818 B
JSON
18 lines
818 B
JSON
{
|
|
"displayName": "Merge Conflict",
|
|
"description": "Highlighting and commands for inline merge conflicts.",
|
|
"command.category": "Merge Conflict",
|
|
"command.accept.all-current": "Accept All Current",
|
|
"command.accept.all-incoming": "Accept All Incoming",
|
|
"command.accept.all-both": "Accept All Both",
|
|
"command.accept.current": "Accept Current",
|
|
"command.accept.incoming": "Accept Incoming",
|
|
"command.accept.selection": "Accept Selection",
|
|
"command.accept.both": "Accept Both",
|
|
"command.next": "Next Conflict",
|
|
"command.previous": "Previous Conflict",
|
|
"command.compare": "Compare Current Conflict",
|
|
"config.title": "Merge Conflict",
|
|
"config.codeLensEnabled": "Enable/disable merge conflict block CodeLens within editor",
|
|
"config.decoratorsEnabled": "Enable/disable merge conflict decorators within editor"
|
|
} |