lib/eternity/patch.rb in eternity-0.0.4 vs lib/eternity/patch.rb in eternity-0.0.5

@@ -72,11 +72,11 @@
 
     end
 
 
     class Merge
-      extend Log
+      
       include Common
 
       def merged?
         @merged ||= current_commit == target_commit ||
                     target_commit.fast_forward?(current_commit) || 
@@ -93,24 +93,22 @@
       def merge_deltas(current_delta, target_delta, revert_delta, base_index)
         remaining_delta = Delta.merge remaining_history.reverse.map(&:delta), base_index
         Delta.merge [revert_delta, target_delta, remaining_delta], base_index
       end
 
-      log :calculate_delta
     end
 
 
     class Diff
-      extend Log
+
       include Common
 
       private
 
       def merge_deltas(current_delta, target_delta, revert_delta, base_index)
         Delta.merge [revert_delta, target_delta], base_index
       end
 
-      log :calculate_delta
     end
 
   end
 end