Skip to content

Commit f4c9569

Browse files
committed
feat: Port changes from 4.10
* Add `check` task on CI * Update README.md
1 parent 4916754 commit f4c9569

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This is a port of [java-diff-utils](https://github.com/java-diff-utils/java-diff
1111
with multiplatform support. All credit for the implementation goes to original authors.
1212

1313
## Features
14-
All features from version 4.9 of the original library are present, except for:
14+
All features from version 4.10 of the original library are present, except for:
1515
* Unified diff, which heavily uses file read/write and therefore needs a more complicated rewrite for kotlin-multiplatform
1616
* diff-utils-jgit, which uses JVM-only jgit library
1717

src/commonMain/kotlin/io/github/petertrr/diffutils/patch/ConflictOutput.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class ConflictProducingConflictOutput : ConflictOutput<String> {
3535
override fun processConflict(verifyChunk: VerifyChunk, delta: Delta<String>, result: MutableList<String>) {
3636
if (result.size > delta.source.position) {
3737
val orgData = mutableListOf<String>()
38-
for (i in 0 until delta.source.size()) {
38+
(0 until delta.source.size()).forEach { _ ->
3939
orgData.add(
4040
result.removeAt(delta.source.position)
4141
)

0 commit comments

Comments
 (0)