2017-05-22 22:56:18 +02:00
|
|
|
{
|
2018-02-26 09:48:26 +01:00
|
|
|
"displayName": "Merge Conflict",
|
2018-03-02 01:43:06 +01:00
|
|
|
"description": "Highlighting and commands for inline merge conflicts.",
|
2017-05-22 23:04:51 +02:00
|
|
|
"command.category": "Merge Conflict",
|
2017-11-17 05:41:17 +01:00
|
|
|
"command.accept.all-current": "Accept All Current",
|
2017-05-31 19:39:31 +02:00
|
|
|
"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",
|
2017-05-22 23:04:51 +02:00
|
|
|
"command.accept.both": "Accept Both",
|
2017-05-31 19:39:31 +02:00
|
|
|
"command.next": "Next Conflict",
|
|
|
|
"command.previous": "Previous Conflict",
|
|
|
|
"command.compare": "Compare Current Conflict",
|
2017-05-23 20:54:43 +02:00
|
|
|
"config.title": "Merge Conflict",
|
2018-10-02 15:57:39 +02:00
|
|
|
"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
|
2018-07-30 12:35:43 +02:00
|
|
|
"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
|
2019-05-23 23:19:09 +02:00
|
|
|
"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
|
2019-05-28 23:54:29 +02:00
|
|
|
"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts.",
|
|
|
|
"config.diffViewPosition.current": "Open the diff view in the current editor group.",
|
|
|
|
"config.diffViewPosition.beside": "Open the diff view next to the current editor group.",
|
|
|
|
"config.diffViewPosition.below": "Open the diff view below the current editor group."
|
2017-05-22 22:56:18 +02:00
|
|
|
}
|