Merge from vscode ff915844119ce9485abfe8aa9076ec76b5300ddd (#10030)

extensions/git/package.json

@@ -1262,7 +1262,7 @@
       "timeline/item/context": [
         {
           "command": "git.timeline.openDiff",
-          "group": "1_actions",
+          "group": "1_timeline",
           "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file\\b/"
         },
         {

extensions/git/src/git.ts

@@ -443,7 +443,10 @@ export class Git {
 						);
 						if (networkPath !== undefined) {
 							return path.normalize(
-								repoUri.fsPath.replace(networkPath, `${letter.toLowerCase()}:`),
+								repoUri.fsPath.replace(
+									networkPath,
+									`${letter.toLowerCase()}:${networkPath.endsWith('\\') ? '\\' : ''}`
+								),
 							);
 						}
 					} catch { }