fix microsoft#37596

jrieken · jrieken · commit ff029d558982 · 2017-11-03T11:38:12.000+01:00
diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts
@@ -82,6 +82,7 @@ class GitDecorationProvider implements DecorationProvider {
 		let newDecorations = new Map<string, DecorationData>();
 		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) => {
