summaryrefslogtreecommitdiff
path: root/test/rubygems/test_gem_resolver_conflict.rb
AgeCommit message (Expand)Author
2019-07-30[rubygems/rubygems] Remove conflict.rb code that was supposed to be removed i...bronzdoc
2018-11-21Merge master branch from rubygems/rubygems upstream.hsbt
2017-10-08Merge rubygems master.hsbt
2016-02-01* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.hsbt
2015-12-16Add frozen_string_literal: false for all filesnaruse
2014-09-14* lib/rubygems: Update to RubyGems 2.4.1 master(713ab65)hsbt
2013-11-21* lib/rubygems: Update to RubyGems master 50a8210. Important changesdrbrain
2013-11-19* lib/rubygems: Update to RubyGems master 6a3d9f9. Changes include:drbrain