The rails 3.1 asset pipeline is including .orig files generated by git and causing the asset to be included twice in the generated bundle. I understand the .js.coffee convention, but .js.orig should be excluded from this list.
app/assets/javascripts/application.js
app/assets/javascripts/example.js
app/assets/javascripts/example.js.orig
alert('js loaded - should be ignored');
generates:
http://localhost:3000/assets/application.js
alert('js loaded');
alert('js loaded - should be ignored');