mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	
							parent
							
								
									6412121b00
								
							
						
					
					
						commit
						4913c9b6bf
					
				
				
				Notes:
				
					git
				
				2019-08-31 04:40:14 +09:00 
				
			
			
			
		
		
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -146,7 +146,7 @@ RSpec.describe "The library itself" do
 | 
			
		|||
 | 
			
		||||
  it "does not include any unresolved merge conflicts" do
 | 
			
		||||
    error_messages = []
 | 
			
		||||
    exempt = %r{lock/lockfile_(bundler_1_)?spec|quality_spec|vcr_cassettes|\.ronn|lockfile_parser\.rb}
 | 
			
		||||
    exempt = %r{lock/lockfile_spec|quality_spec|vcr_cassettes|\.ronn|lockfile_parser\.rb}
 | 
			
		||||
    Dir.chdir(root) do
 | 
			
		||||
      files = ruby_core? ? `git ls-files -z -- lib/bundler lib/bundler.rb spec/bundler` : `git ls-files -z`
 | 
			
		||||
      files.split("\x0").each do |filename|
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue