提交 0a5343aa 编写于 作者: M mnikn 提交者: Christof Marti
上级 7829e504
......@@ -83,6 +83,20 @@
"command": "merge-conflict.compare"
}
],
"menus": {
"scm/resourceState/context": [
{
"command": "merge-conflict.accept.all-current",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "1_modification"
},
{
"command": "merge-conflict.accept.all-incoming",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "1_modification"
}
]
},
"configuration": {
"title": "%config.title%",
"properties": {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册