1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
{
"": [
"--------------------------------------------------------------------------------------------",
"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": "合併衝突",
"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": "啟用/停用 編輯器衝突合併色彩裝飾"
}
|
