From ff029d5589820bcb22b8d84875ef47bdefed2646 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 3 Nov 2017 11:38:12 +0100
Subject: [PATCH] fix #37596

---
 extensions/git/src/decorationProvider.ts | 1 +
 1 file changed, 1 insertion(+)

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<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) => {