diff --git a/extensions/git/package.json b/extensions/git/package.json index 4c55452a864..3b47b21b9d1 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -1424,12 +1424,12 @@ }, { "command": "git.viewStagedChanges", - "when": "scmProvider == git && scmResourceGroup == index", + "when": "scmProvider == git && scmResourceGroup == index && config.multiDiffEditor.experimental.enabled", "group": "inline@1" }, { "command": "git.viewChanges", - "when": "scmProvider == git && scmResourceGroup == workingTree", + "when": "scmProvider == git && scmResourceGroup == workingTree && config.multiDiffEditor.experimental.enabled", "group": "inline@1" } ], @@ -1811,7 +1811,7 @@ { "command": "git.timeline.openCommit", "group": "inline", - "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection" + "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection && config.multiDiffEditor.experimental.enabled" }, { "command": "git.timeline.openDiff", @@ -1821,7 +1821,7 @@ { "command": "git.timeline.openCommit", "group": "1_actions@2", - "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection" + "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection && config.multiDiffEditor.experimental.enabled" }, { "command": "git.timeline.compareWithSelected",