1085
1086
if (left.originalStart + left.originalLength >= right.originalStart || left.modifiedStart + left.modifiedLength >= right.modifiedStart) {
1087
>
const originalStart = left.originalStart;
diff.ts
1088
>
let originalLength = left.originalLength;
1089
>
const modifiedStart = left.modifiedStart;
1090
>
let modifiedLength = left.modifiedLength;
1091
>
1092
>
if (left.originalStart + left.originalLength >= right.originalStart) {
1093
>
originalLength = right.originalStart + right.originalLength - left.originalStart;
1094
>
}
1095
>
if (left.modifiedStart + left.modifiedLength >= right.modifiedStart) {
1096
>
modifiedLength = right.modifiedStart + right.modifiedLength - left.modifiedStart;
1097
>
}
1098
>
1099
>
mergedChangeArr[0] = new DiffChange(originalStart, originalLength, modifiedStart, modifiedLength);
1100
>
return true;
1101
} else {
1102
mergedChangeArr[0] = null;