Skip to content

Commit

Permalink
Merge branch 'release/1.80' into joh/fix/187642
Browse files Browse the repository at this point in the history
  • Loading branch information
jrieken authored Jul 12, 2023
2 parents 89726fc + e546b82 commit 0f871d1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function joinSequenceDiffs(sequence1: ISequence, sequence2: ISequence, se

// First move them all to the left as much as possible and join them if possible
for (let i = 1; i < sequenceDiffs.length; i++) {
const prevResult = sequenceDiffs[i - 1];
const prevResult = result[result.length - 1];
let cur = sequenceDiffs[i];

if (cur.seq1Range.isEmpty || cur.seq2Range.isEmpty) {
Expand Down

0 comments on commit 0f871d1

Please sign in to comment.