summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-30 16:50:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-30 16:50:41 +0000
commit1ce0018ba1b26fcb5c8f294d2908a56ef0310464 (patch)
tree1515814b34452b12c234e3154c556c51ae6ccdca
parent5388ef52fa776f8ca102e85366561399b89b25ac (diff)
remove conflict
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/optparse.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb
index a5905d2d4b8..de88b648ec9 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -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