2017-05-22 22:56:18 +02:00
|
|
|
{
|
2017-05-22 23:04:51 +02:00
|
|
|
"command.category": "Merge Conflict",
|
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",
|
2017-05-23 18:50:23 +02:00
|
|
|
"config.codeLensEnabled": "Enable/disable merge conflict block CodeLens within editor",
|
|
|
|
"config.decoratorsEnabled": "Enable/disable merge conflict decorators within editor"
|
2017-05-22 22:56:18 +02:00
|
|
|
}
|