diff options
Diffstat (limited to 'i18n/chs/extensions/merge-conflict/package.i18n.json')
| -rw-r--r-- | i18n/chs/extensions/merge-conflict/package.i18n.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/i18n/chs/extensions/merge-conflict/package.i18n.json b/i18n/chs/extensions/merge-conflict/package.i18n.json index 27c21452e0a..4a3b57f3568 100644 --- a/i18n/chs/extensions/merge-conflict/package.i18n.json +++ b/i18n/chs/extensions/merge-conflict/package.i18n.json @@ -7,7 +7,7 @@ "Do not edit this file. It is machine generated." ], "displayName": "合并冲突", - "description": "内联合并冲突的配色与命令。", + "description": "为内联合并冲突提供高亮和命令。", "command.category": "合并冲突", "command.accept.all-current": "全部采用当前内容", "command.accept.all-incoming": "全部采用传入版本", |