summaryrefslogtreecommitdiff
path: root/test/rubygems/test_gem_resolver_conflict.rb
AgeCommit message (Expand)Author
2016-08-24merge revision(s) 53707,53708,53709,53712,53777,53781: [Backport #12326]nagachika
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