fixes #36885

extensions/git/package.json

@@ -701,11 +701,21 @@
           "when": "scmProvider == git && scmResourceGroup == merge",
           "group": "1_modification"
         },
+        {
+          "command": "git.openFile",
+          "when": "scmProvider == git && scmResourceGroup == merge",
+          "group": "navigation"
+        },
         {
           "command": "git.stage",
           "when": "scmProvider == git && scmResourceGroup == merge",
           "group": "inline"
         },
+        {
+          "command": "git.openFile",
+          "when": "scmProvider == git && scmResourceGroup == merge",
+          "group": "inline0"
+        },
         {
           "command": "git.openChange",
           "when": "scmProvider == git && scmResourceGroup == index",
@@ -731,6 +741,11 @@
           "when": "scmProvider == git && scmResourceGroup == index",
           "group": "inline"
         },
+        {
+          "command": "git.openFile",
+          "when": "scmProvider == git && scmResourceGroup == index",
+          "group": "inline0"
+        },
         {
           "command": "git.openChange",
           "when": "scmProvider == git && scmResourceGroup == workingTree",
@@ -766,6 +781,11 @@
           "when": "scmProvider == git && scmResourceGroup == workingTree",
           "group": "inline"
         },
+        {
+          "command": "git.openFile",
+          "when": "scmProvider == git && scmResourceGroup == workingTree",
+          "group": "inline0"
+        },
         {
           "command": "git.ignore",
           "when": "scmProvider == git && scmResourceGroup == workingTree",
@@ -979,4 +999,4 @@
     "@types/which": "^1.0.28",
     "mocha": "^3.2.0"
   }
-}
+}
\ No newline at end of file

src/vs/workbench/parts/scm/electron-browser/scmMenus.ts

@@ -88,7 +88,7 @@ export class SCMMenus implements IDisposable {
 		const primary: IAction[] = [];
 		const secondary: IAction[] = [];
 		const result = { primary, secondary };
-		fillInActions(menu, { shouldForwardArgs: true }, result, g => g === 'inline');
+		fillInActions(menu, { shouldForwardArgs: true }, result, g => /^inline/.test(g));
 
 		menu.dispose();
 		contextKeyService.dispose();