mirror of
https://github.com/Microsoft/vscode
synced 2024-10-06 03:17:00 +00:00
Only match exactly 7 equals (fixes #95040)
This commit is contained in:
parent
cd97629c44
commit
2678e4b848
|
@ -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? >>>>>>>
|
||||
|
|
Loading…
Reference in a new issue