mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-18 19:11:36 -04:00
dafb780987
* Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms
25 lines
1.2 KiB
JSON
25 lines
1.2 KiB
JSON
{
|
|
"": [
|
|
"--------------------------------------------------------------------------------------------",
|
|
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
|
"Licensed under the Source EULA. 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": "启用/禁用编辑器内的合并冲突修饰器"
|
|
} |