Merge pull request #2454 from microsoft/joshspicer/candidate-3b825b0

joshspicer · web-flow · commit 758c9c04f77f · 2025-12-05T12:56:33.000-08:00
adopt vscode#281431 (#2420)
diff --git a/package.json b/package.json
@@ -4551,6 +4551,12 @@
 					"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && git.activeResourceHasMergeConflicts"
 				}
 			],
+			"multiDiffEditor/content": [
+				{
+					"command": "github.copilot.chat.applyCopilotCLIAgentSessionChanges",
+					"when": "resourceScheme == copilotcli-worktree-changes"
+				}
+			],
 			"chat/chatSessions": [
 				{
 					"command": "github.copilot.chat.applyCopilotCLIAgentSessionChanges",

Original file line number	Diff line number	Diff line change
`@@ -4551,6 +4551,12 @@`
`4551`	`4551`	`"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && git.activeResourceHasMergeConflicts"`
`4552`	`4552`	`}`
`4553`	`4553`	`],`
	`4554`	`+ "multiDiffEditor/content": [`
	`4555`	`+ {`
	`4556`	`+ "command": "github.copilot.chat.applyCopilotCLIAgentSessionChanges",`
	`4557`	`+ "when": "resourceScheme == copilotcli-worktree-changes"`
	`4558`	`+ }`
	`4559`	`+ ],`
`4554`	`4560`	`"chat/chatSessions": [`
`4555`	`4561`	`{`
`4556`	`4562`	`"command": "github.copilot.chat.applyCopilotCLIAgentSessionChanges",`