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

Fix Travis CI failure of multiple_merges_during_fold_test #74

Merged
merged 3 commits into from Mar 5, 2013

Commits on Dec 3, 2012

  1. Fix Travis CI failure of multiple_merges_during_fold_test

    The environment that Travis runs test under unfortunately does not
    immediately pick up the expected number of files to merge for the
    different merge operations in the multiple_merges_during_fold_test.
    This commit changes the test to re-try merging until the expected
    result is seen (or eventually have the test timeout).
    jtuple committed Dec 3, 2012
    Copy the full SHA
    0b0a339 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2013

  1. Copy the full SHA
    54cd177 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    771c92d View commit details
    Browse the repository at this point in the history