Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge

2026-04-27 12:04:04 +01:00 · 2017-06-26 09:56:42 +02:00
parent b84074b7b4 89cd05f877
commit f23a32b7a7
5 changed files with 50 additions and 3 deletions
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -177,6 +177,11 @@
        "title": "%command.deleteBranch%",
        "category": "Git"
      },
+      {
+        "command": "git.merge",
+        "title": "%command.merge%",
+        "category": "Git"
+      },
      {
        "command": "git.pull",
        "title": "%command.pull%",