kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

remove conflict

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-05-30 16:50:41 +00:00
parent 5388ef52fa
commit 1ce0018ba1
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/optparse.rb
View file

@ -414,11 +414,7 @@ summary feature.
pat = t if t.respond_to?(:match)
end
unless block
<<<<<<< optparse.rb
block = pat.method(:convert).to_block if pat.respond_to?(:convert)
=======
block = pat.method(:convert).to_block if pat.respond_to?(:convert)
>>>>>>> 1.19
end
@atype[t] = [pat, block]
end
@ -953,11 +949,7 @@ Default options, which never appear in option summary.
# directly specified pattern(any object possible to match)
if !(String === o) and o.respond_to?(:match)
pattern = notwice(o, pattern, 'pattern')
<<<<<<< optparse.rb
conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert))
=======
conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert))
>>>>>>> 1.19
next
end
@ -970,11 +962,7 @@ Default options, which never appear in option summary.
when CompletingHash
when nil
pattern = CompletingHash.new
<<<<<<< optparse.rb
conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert))
=======
conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert))
>>>>>>> 1.19
else
raise ArgumentError, "argument pattern given twice"
end