maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only match exactly 7 equals (fixes #95040)

Browse source
This commit is contained in:
Alexandre Schnegg 2021-02-09 10:35:10 +01:00 committed by GitHub
parent cd97629c44
commit 2678e4b848
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/merge-conflict/src/mergeConflictParser.ts
View file

@ -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? >>>>>>>