From 2678e4b848ab2506e2d25bc16985a8b81df79000 Mon Sep 17 00:00:00 2001
From: Alexandre Schnegg <alexandre.schnegg@gmail.com>
Date: Tue, 9 Feb 2021 10:35:10 +0100
Subject: [PATCH] Only match exactly 7 equals (fixes #95040)

---
 extensions/merge-conflict/src/mergeConflictParser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/merge-conflict/src/mergeConflictParser.ts b/extensions/merge-conflict/src/mergeConflictParser.ts
index 84a4607ac14..06e4237fea7 100644
--- a/extensions/merge-conflict/src/mergeConflictParser.ts
+++ b/extensions/merge-conflict/src/mergeConflictParser.ts
@@ -58,7 +58,7 @@ export class MergeConflictParser {
 				currentConflict.commonAncestors.push(line);
 			}
 			// Are we within a conflict block and is this a splitter? =======
-			else if (currentConflict && !currentConflict.splitter && line.text.startsWith(splitterMarker)) {
+			else if (currentConflict && !currentConflict.splitter && line.text === splitterMarker) {
 				currentConflict.splitter = line;
 			}
 			// Are we within a conflict block and is this a footer? >>>>>>>