Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 06:51:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - getSCMResource() should also look at the merge group (#164450)

Browse Source 
getSCMResource() should also look at the merge group
This commit is contained in:
Ladislau Szomoru
2022-10-24 15:27:56 +02:00
committed by GitHub
parent 9812344420
commit 7bd27b4287
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/git/src/commands.ts
View File

@@ -3374,7 +3374,8 @@ export class CommandCenter {
}
return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
|| repository.mergeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
}
return undefined;
}