merge revision(s) 58823: [Backport #11464]
erb.rb: Allow trimming carriage return when trim_mode is "<>", for Windows environments. [Bug #11464]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 58823: [Backport #11464]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e