Skip to content

Conversation

neshkeev
Copy link
Contributor

@neshkeev neshkeev commented Oct 1, 2019

This patch enables tests from testsuite/niocharset/* for Scala.js

@nicolasstucki
Copy link
Contributor

@neshkeev you will need to rebase. The diff conflicted with #7352.

@nicolasstucki
Copy link
Contributor

I managed to fix the conflict from the web interface

@neshkeev
Copy link
Contributor Author

neshkeev commented Oct 2, 2019

@nicolasstucki Thank you for fixing the conflict, but I prefer avoiding excessive merge commits if possible, I rebased the original branch, please review and merge it if possible

This patch enables tests from testsuite/niocharset/* for Scala.js

Signed-off-by: Nikita Eshkeev <kastolom@gmail.com>
@nicolasstucki nicolasstucki merged commit e005473 into scala:master Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants