Adds "Accept All Current" to command palette
This commit is contained in:
parent
d51ea03177
commit
58c1273a04
|
@ -21,6 +21,11 @@
|
||||||
},
|
},
|
||||||
"contributes": {
|
"contributes": {
|
||||||
"commands": [
|
"commands": [
|
||||||
|
{
|
||||||
|
"category": "%command.category%",
|
||||||
|
"title": "%command.accept.all-current%",
|
||||||
|
"command": "merge-conflict.accept.all-current"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"category": "%command.category%",
|
"category": "%command.category%",
|
||||||
"title": "%command.accept.all-incoming%",
|
"title": "%command.accept.all-incoming%",
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
"command.category": "Merge Conflict",
|
"command.category": "Merge Conflict",
|
||||||
|
"command.accept.all-current": "Accept All Current",
|
||||||
"command.accept.all-incoming": "Accept All Incoming",
|
"command.accept.all-incoming": "Accept All Incoming",
|
||||||
"command.accept.all-both": "Accept All Both",
|
"command.accept.all-both": "Accept All Both",
|
||||||
"command.accept.current": "Accept Current",
|
"command.accept.current": "Accept Current",
|
||||||
|
|
Loading…
Reference in a new issue