summaryrefslogtreecommitdiff
path: root/spec/acceptance/merge_spec.rb
AgeCommit message (Expand)Author
2014-05-07Adding more spec coverageHunter Haugen