10 lines
596 B
Markdown
10 lines
596 B
Markdown
|
# 3-way merge
|
||
|
|
|
||
|
|
Tho tools to make smart merge of two versions of changed original data. See [merge3] function online docs.
|
||
|
|
|
||
|
|
|
||
|
|
## Acknowledgments
|
||
|
|
|
||
|
|
This work is based on the original kotlin diff port https://github.com/GitLiveApp/kotlin-diff-utils work, unfortunatley its packaging is not compatible with current kotlin MP formats so I can't just use it as the dependencies. The wholde `dev.gitlive.difflib` is taken from the link above, where it was published under the [Apache 2.0 license at the moment of borrowing this code](https://github.com/GitLiveApp/kotlin-diff-utils/blob/master/LICENSE).
|
||
|
|
|