Fix merge conflict.
This commit is contained in:
parent
3c194717c0
commit
dfb7bf472d
|
@ -134,6 +134,7 @@ class Pry
|
||||||
commands[new_name].description = desc if desc
|
commands[new_name].description = desc if desc
|
||||||
end
|
end
|
||||||
|
|
||||||
|
$i = 0
|
||||||
# Runs a command.
|
# Runs a command.
|
||||||
# @param [Object] context Object which will be used as self during the
|
# @param [Object] context Object which will be used as self during the
|
||||||
# command.
|
# command.
|
||||||
|
@ -151,7 +152,7 @@ class Pry
|
||||||
if command.options[:argument_required] && args.empty?
|
if command.options[:argument_required] && args.empty?
|
||||||
puts "The command '#{command.name}' requires an argument."
|
puts "The command '#{command.name}' requires an argument."
|
||||||
else
|
else
|
||||||
command.call(context, *args)
|
command.call context, *args
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue