Merge arbitrary types #25
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
correabuscar
reviewed
Jul 8, 2024
src/lib.rs
Outdated
| //! `patch`. | ||
| //! manipulate differences between files or arbitrary data inspired by | ||
| //! [LibXDiff] and [GNU Diffutils]. Version control systems like [Git] and | ||
| //! [Mercurial] generallycommunicate differences between two versions of a |
There was a problem hiding this comment.
Fixed. I've also rebased so that this branch no longer conflicts with master
This will be useful to disambiguiate when adding support for 3-way merging of arbitrary types
Because MergeRange<T> are actually always MergeRange<[u64]>
This makes this crate useful to apply 3-way merges on arbitrary data
daladim
force-pushed
the
merge_arbitrary_types
branch
from
3bce77b to
a9cee93
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #23
Depends on #22