Merge master to dev15.8 #5000
Merged
Merge master to dev15.8 #5000
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
* Attempt add match! syntax to parser (as normal match) (does not work)
* Add name for MATCH_BANG token ("keyword 'match!')
* Make match! valid in (and only in) computational expressions
* match! works
* Add match! to xlf localization files
* Add two tests for match!
* Don't use left-pipe
* Give match! keyword a description
* Fix syntax error, and change match! description
* xlf updated
* Add match! keyword description to resx
* Update FSComp.fs
* Write quotation test for match!
* First crack at compile error tests
* Fix baselines
* Fix baseline one more time
* Add vs baseline
* Fix merge mistake
* Fix merge mistake (#2)
* Fix merge mistake in tests
* Fix yellow triangle of horror * typo
|
@dotnet-bot test Ubuntu16.04 Release_default Build please |
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 an automatically generated pull request from master into dev15.8.
git fetch --all git checkout merges/master-to-dev15.8 git reset --hard upstream/dev15.8 git merge upstream/master # Fix merge conflicts git commit git push merges/master-to-dev15.8 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.