gistfile1.txt

$ merb-gen resource file
Generating with resource generator:
 [IDENTICAL]  spec/models/file_spec.rb
  [CONFLICT]  app/models/file.rb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
 ~ Compiling routes...
2
Overwritten
  [CONFLICT]  app/controllers/files.rb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
  [CONFLICT]  app/views/files/index.html.erb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
 ~ Removed constant Files from Object
2
Overwritten
  [CONFLICT]  app/views/files/show.html.erb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
  [CONFLICT]  app/views/files/edit.html.erb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
  [CONFLICT]  app/views/files/new.html.erb
1. skip
2. overwrite
3. render
4. diff
5. abort
How do you wish to proceed with this file?
2
Overwritten
 [IDENTICAL]  app/helpers/files_helper.rb
 [IDENTICAL]  spec/helpers/files_helper_spec.rb