OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

chore(vscode): update to 1.54.2

Browse Source
This commit is contained in:
Joe Previte
2021-03-11 10:27:10 -07:00
parent 44a4a0bc20 e8cd17a97d
commit 0cd3e39492
1459 changed files with 53404 additions and 51004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vscode/extensions/merge-conflict/package.json
View File

@ -140,5 +140,9 @@
},
"devDependencies": {
"@types/node": "^12.19.9"
},
"repository": {
"type": "git",
"url": "https://github.com/microsoft/vscode.git"
}
}

2
lib/vscode/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? >>>>>>>