1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
{
"": [
"--------------------------------------------------------------------------------------------",
"Copyright (c) Microsoft Corporation. All rights reserved.",
"Licensed under the MIT License. See License.txt in the project root for license information.",
"--------------------------------------------------------------------------------------------",
"Do not edit this file. It is machine generated."
],
"displayName": "合并冲突",
"description": "内联合并冲突的配色与命令。",
"command.category": "合并冲突",
"command.accept.all-current": "全部采用当前内容",
"command.accept.all-incoming": "全部采用传入版本",
"command.accept.all-both": "全部保留两者",
"command.accept.current": "采用当前内容",
"command.accept.incoming": "采用传入内容",
"command.accept.selection": "采用选中版本",
"command.accept.both": "保留两者",
"command.next": "下一个冲突",
"command.previous": "上一个冲突",
"command.compare": "比较当前冲突",
"config.title": "合并冲突",
"config.codeLensEnabled": "启用/禁用编辑器内合并冲突区域的 CodeLens",
"config.decoratorsEnabled": "启用/禁用编辑器内的合并冲突修饰器"
}
|
