提交 58c1273a 编写于 作者: J Joe Martella 提交者: Christof Marti

Adds "Accept All Current" to command palette

上级 d51ea031
......@@ -21,6 +21,11 @@
},
"contributes": {
"commands": [
{
"category": "%command.category%",
"title": "%command.accept.all-current%",
"command": "merge-conflict.accept.all-current"
},
{
"category": "%command.category%",
"title": "%command.accept.all-incoming%",
......
{
"command.category": "Merge Conflict",
"command.accept.all-current": "Accept All Current",
"command.accept.all-incoming": "Accept All Incoming",
"command.accept.all-both": "Accept All Both",
"command.accept.current": "Accept Current",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册