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

getSCMResource() should also look at the merge group
microsoft · Oct 24, 2022 · 7bd27b4 · 7bd27b4
1 parent 9812344
commit 7bd27b4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -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;
 	}