2017-05-22 22:56:18 +02:00
|
|
|
{
|
2017-05-22 23:04:51 +02:00
|
|
|
"command.category": "Merge Conflict",
|
|
|
|
"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",
|
2017-05-22 22:56:18 +02:00
|
|
|
"config.enabled": "Whether merge conflict editor decorations and code lenses are enabled"
|
|
|
|
}
|