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 merging of result sets for unloaded files #513

Merged
merged 2 commits into from
Jul 13, 2016

Commits on Jul 13, 2016

  1. Add test cases for merge_helpers

    Proper merging of a file which is only available on one of the two merged resultset
    hanazuki committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    645703a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cfab71d View commit details
    Browse the repository at this point in the history