1
0
Fork 0
mirror of https://github.com/pry/pry.git synced 2022-11-09 12:35:05 -05:00

Fix merge conflict.

This commit is contained in:
Rob Gleeson 2011-05-23 11:27:23 +01:00
parent 3c194717c0
commit dfb7bf472d

View file

@ -134,6 +134,7 @@ class Pry
commands[new_name].description = desc if desc
end
$i = 0
# Runs a command.
# @param [Object] context Object which will be used as self during the
# command.
@ -151,7 +152,7 @@ class Pry
if command.options[:argument_required] && args.empty?
puts "The command '#{command.name}' requires an argument."
else
command.call(context, *args)
command.call context, *args
end
end