diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts index 614a793e4af..dcd1077819e 100644 --- a/extensions/git/src/decorationProvider.ts +++ b/extensions/git/src/decorationProvider.ts @@ -82,6 +82,7 @@ class GitDecorationProvider implements DecorationProvider { let newDecorations = new Map(); this.collectDecorationData(this.repository.indexGroup, newDecorations); this.collectDecorationData(this.repository.workingTreeGroup, newDecorations); + this.collectDecorationData(this.repository.mergeGroup, newDecorations); let uris: Uri[] = []; newDecorations.forEach((value, uriString) => {