mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
remove conflict
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5388ef52fa
commit
1ce0018ba1
1 changed files with 0 additions and 12 deletions
|
@ -414,11 +414,7 @@ summary feature.
|
||||||
pat = t if t.respond_to?(:match)
|
pat = t if t.respond_to?(:match)
|
||||||
end
|
end
|
||||||
unless block
|
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)
|
||||||
=======
|
|
||||||
block = pat.method(:convert).to_block if pat.respond_to?(:convert)
|
|
||||||
>>>>>>> 1.19
|
|
||||||
end
|
end
|
||||||
@atype[t] = [pat, block]
|
@atype[t] = [pat, block]
|
||||||
end
|
end
|
||||||
|
@ -953,11 +949,7 @@ Default options, which never appear in option summary.
|
||||||
# directly specified pattern(any object possible to match)
|
# directly specified pattern(any object possible to match)
|
||||||
if !(String === o) and o.respond_to?(:match)
|
if !(String === o) and o.respond_to?(:match)
|
||||||
pattern = notwice(o, pattern, 'pattern')
|
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))
|
||||||
=======
|
|
||||||
conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert))
|
|
||||||
>>>>>>> 1.19
|
|
||||||
next
|
next
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -970,11 +962,7 @@ Default options, which never appear in option summary.
|
||||||
when CompletingHash
|
when CompletingHash
|
||||||
when nil
|
when nil
|
||||||
pattern = CompletingHash.new
|
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))
|
||||||
=======
|
|
||||||
conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert))
|
|
||||||
>>>>>>> 1.19
|
|
||||||
else
|
else
|
||||||
raise ArgumentError, "argument pattern given twice"
|
raise ArgumentError, "argument pattern given twice"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue