Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support 3-way merging arbitrary data #23

Open
daladim opened this issue Mar 16, 2023 · 1 comment · May be fixed by #25
Open

Support 3-way merging arbitrary data #23

daladim opened this issue Mar 16, 2023 · 1 comment · May be fixed by #25

Comments

@daladim
Copy link
Contributor

daladim commented Mar 16, 2023

Thanks for this great crate!

Akthough several crates on crates.io implement Myers' algorithm, diffy is the only one (If I understood correctly) that easily performs 3-way merges.
I need to make 3-way merges for non-textual types (lists of integers), and that would be awesome that this crate would make it possible.
@daladim
Copy link
Contributor Author

daladim commented Mar 16, 2023

I have done changes.
I'll play with it and I'll make a pull request as soon as I am happy with it :)

@daladim daladim linked a pull request Jul 26, 2023 that will close this issue
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Merge arbitrary types daladim/diffy
1 participant
@daladim