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.

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

Diff from branch-point-with-tests to 0-18-x #7

Open
wants to merge 1 commit into
base: branch-point-with-tests
Choose a base branch
from

Conversation

oligriffiths
Copy link
Owner

@oligriffiths oligriffiths commented Apr 3, 2018

The common root of 0-18-x and master is ab404ef725be5c265c901838be40d0358a867ec4

The commit just after that is f5a1f3ddb1a01a4a9c312be12f1efed2b6d38611 (branch-point-with-tests) which converts the test suite from tap to mocha.

This diff is from f5a1f3ddb1a01a4a9c312be12f1efed2b6d38611 to 0-18-x, as we have since converted the test suite to mocha, so rather than include those changes in the diff, I'm branching off after the mocha changes were made.

This also includes only changes, no deletions to keep the diff down, as most of the lib folder was removed in the 0-18-x series, but not in the actual broccoli master.

@oligriffiths oligriffiths changed the base branch from branch-point to branch-point-with-tests April 3, 2018 15:42
@oligriffiths oligriffiths changed the title Patch from branch-point to 0-18-x Patch from branch-point-with-tests to 0-18-x Apr 3, 2018
@oligriffiths oligriffiths changed the title Patch from branch-point-with-tests to 0-18-x Diff from branch-point-with-tests to 0-18-x Apr 3, 2018
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.

1 participant