obsidian-plugin/silvanocerza_github-gitless-sync
1
0
Fork 0
mirror of https://github.com/silvanocerza/github-gitless-sync.git synced 2026-07-22 12:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clamp diffs lines after merging

Browse source
This commit is contained in:
Silvano Cerza 2025-02-21 18:40:17 +01:00
parent bca72c4938
commit 64d0223aa0
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/views/conflicts-resolution/diff.ts
View file

@ -87,10 +87,8 @@ function diff(oldText: string, newText: string): DiffChunk[] {
}
}
return mergeDiffs(
result.map((chunk) =>
clampChunkLines(chunk, oldLines.length, newLines.length),
),
return mergeDiffs(result).map((chunk) =>
clampChunkLines(chunk, oldLines.length, newLines.length),
);
}