gistfile1.txt

First, rewinding head to replay your work on top of it...
Applying: Improve rewindable input test coverage so tests fail when you remove the middleware
error: actionpack/test/controller/request/multipart_params_parsing_test.rb: does not exist in index
error: actionpack/test/controller/request/url_encoded_params_parsing_test.rb: does not exist in index
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Renaming actionpack/test/controller/request/multipart_params_parsing_test.rb => actionpack/test/dispatch/request/multipart_params_parsing_test.rb
Auto-merging actionpack/test/dispatch/request/multipart_params_parsing_test.rb
CONFLICT (rename/modify): Merge conflict in actionpack/test/dispatch/request/multipart_params_parsing_test.rb
Renaming actionpack/test/controller/request/url_encoded_params_parsing_test.rb => actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
Auto-merging actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
CONFLICT (rename/modify): Merge conflict in actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
Failed to merge in the changes.
Patch failed at 0001.