Update merlin for 5.2.0minus-10 #144
Merged
Conversation
This file contains hidden or 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
Contributor
|
@d-kalinichenko I don't follow the latter two commits on this PR |
Contributor
|
I'm reverting commits c8640ad and 689aabf since a) I don't understand the need for them, b) @d-kalinichenko and @ccasin are ooo this week and hence are unable to explain then, and c) 333038c is the version we currently have imported into our internal codebase. I'll merge if CI passes. Once you two are back, we can discuss those two commits and potentially open a separate PR with just them. |
Contributor
Author
|
I don't recognize those commits, and reverting them sounds plausible to me |
Contributor
|
Those commits were needed for OxCaml and are unnecessary internally, let's discuss this later. |
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.
This is a bugfix release that doesn't affect type checking, so the only expected changes are magic number bumps.