maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Adds "Accept All Current" to command palette

Browse source
This commit is contained in:
Joe Martella 2017-11-16 20:41:17 -08:00 committed by Christof Marti
parent d51ea03177
commit 58c1273a04
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extensions/merge-conflict/package.json
View file

@ -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%",

1
extensions/merge-conflict/package.nls.json
View file

@ -1,5 +1,6 @@
{
"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",