Changeset [c50cd2d82110134dc592a8c0e55f2a389ba1cf28] by Yomi Colledge
Revision c50cd2d82110134dc592a8c0e55f2a389ba1cf28,
committed by Yomi Colledge
· April 15th, 2010 @ 09:07 PM
Resolved conflicts
http://github.com/baphled/salad/commit/c50cd2d82110134dc592a8c0e55f...
19 changed files
-
A
app/views/features/system_merge.html.erb -
M
app/controllers/features_controller.rb -
M
app/views/features/show.html.erb -
M
config/routes.rb -
M
features/plain/feature_file_improvements.feature -
M
features/plain/patching_modified_feature_files.feature -
M
features/plain/showing_and_items_info.feature -
M
features/plain/updating_features.feature -
M
features/step_definitions/feature_file_steps.rb -
M
features/step_definitions/feature_import_steps.rb -
M
features/step_definitions/information_and_summary_steps.rb -
M
features/step_definitions/patching_modified_feature_files_steps.rb -
M
features/step_definitions/projects_steps.rb -
M
features/step_definitions/stories_steps.rb -
M
features/step_definitions/updating_feature_steps.rb -
M
spec/controllers/features_controller_spec.rb -
M
spec/models/feature_file_spec.rb -
M
spec/views/features/merge.html.erb_spec.rb -
M
spec/views/features/show.html.erb_spec.rb