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.

Sign up for GitHub

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

Jump to bottom

recursively merge fixtures #165

Merged
merged 1 commit into from Jul 2, 2012
Merged

recursively merge fixtures #165

merged 1 commit into from Jul 2, 2012

Conversation

havvg
Copy link
Member

@havvg havvg commented Jul 2, 2012

fixes #163

@willdurand
Copy link

Wow, good catch!

@havvg
Copy link
Member Author

havvg commented Jul 2, 2012

This also allows to overload data of fixtures, when using multiple fixture files :)

@travisbot
Copy link

This pull request passes (merged 3fd2cc25 into 554132c).

willdurand added a commit that referenced this pull request Jul 2, 2012
@willdurand
Merge pull request #165 from havvg/1.1
62eb1ec 
recursively merge YAML fixtures
@willdurand willdurand merged commit 62eb1ec into propelorm:1.1 Jul 2, 2012
@willdurand
Copy link

Thanks!

@travisbot
Copy link

This pull request fails (merged 90a5977 into 554132c).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@havvg @willdurand @travisbot