From dfb7bf472da2b0fa70cfe84ed23372c0cf902a78 Mon Sep 17 00:00:00 2001
From: Rob Gleeson <rob@flowof.info>
Date: Mon, 23 May 2011 11:27:23 +0100
Subject: [PATCH] Fix merge conflict.

---
 lib/pry/command_set.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pry/command_set.rb b/lib/pry/command_set.rb
index c11d09e7..d2db31b1 100644
--- a/lib/pry/command_set.rb
+++ b/lib/pry/command_set.rb
@@ -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