revert my bad change to articles_controller_spec
I don't know what has gone wrong adding the merge form.
cucumber is ready to implement Scenario: The merge form contains an item named 'merge_with'
commented out simplecov
Non-functional merge form appears at the right time, and not the wrong ones - though tests aren't quite right
Non-functional merge form appears at the right time, and not the wrong ones - though tests aren't quite right