* test/uri/test_generic.rb (URI#test_merge): Test uri + URI(path)
  in addition to uri + path.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e