Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 04:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - only show "Resolve in Merge Editor" editor action when conflict markers are present (#269300)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-10-01 11:28:30 +02:00
committed by GitHub
parent a57de49afb
commit c6d8b3ab0b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/git/package.json
View File

@@ -2297,7 +2297,7 @@
{
"command": "git.openMergeEditor",
"group": "navigation@-10",
"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges"
"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && git.activeResourceHasMergeConflicts"
}
],
"multiDiffEditor/resource/title": [