merge.rb in papa-0.7.0

- old
+ new

@@ -15,9 +15,12 @@
           super
         end
 
         def cleanup
           super
+          require 'papa/command/git/merge_abort'
+          require 'papa/command/git/checkout'
+
           Command::Git::MergeAbort.new.run
           Command::Git::Checkout.new(current_branch).run
         end
 
         def failure_message