From 58c1273a04246a63b22223f33ee206b36a6155d7 Mon Sep 17 00:00:00 2001 From: Joe Martella Date: Thu, 16 Nov 2017 20:41:17 -0800 Subject: [PATCH] Adds "Accept All Current" to command palette --- extensions/merge-conflict/package.json | 5 +++++ extensions/merge-conflict/package.nls.json | 1 + 2 files changed, 6 insertions(+) diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json index 38a33087345..02ca68b911e 100644 --- a/extensions/merge-conflict/package.json +++ b/extensions/merge-conflict/package.json @@ -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%", diff --git a/extensions/merge-conflict/package.nls.json b/extensions/merge-conflict/package.nls.json index b2927ca3431..1df5beb9e71 100644 --- a/extensions/merge-conflict/package.nls.json +++ b/extensions/merge-conflict/package.nls.json @@ -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",