summaryrefslogtreecommitdiff
path: root/spec/acceptance/merge_spec.rb
AgeCommit message (Collapse)Author
2014-10-28Fix testcases for Future Parser and resolve issue with values_at in assuming ↵Travis Fields
that it was dealing with a string
2014-05-07Add mode +x to spec .rb filesHunter Haugen
2014-05-07Adding more spec coverageHunter Haugen