lib/checker/modules/conflict.rb in checker-0.6.4 vs lib/checker/modules/conflict.rb in checker-0.6.5.rc1

@@ -2,18 +2,19 @@
   module Modules
     class Conflict < Base
 
       private
       def check_one(file, opts = {})
-        [check_for_conflict_start(file), check_for_conflict_end(file)].all_true?
+        status = [check_for_conflict_start(file), check_for_conflict_end(file)].all_true?
+        Checker::Result.result(self, status ? 0 : 1)
       end
 
       def check_for_conflict_start(file)
-        !plain_command("grep -n \"<<<<<<< \" #{file}", :bundler => false)
+        !plain_command("grep -n \"<<<<<<< \" #{file}", :bundler => false, :return_boolean => true)
       end
 
       def check_for_conflict_end(file)
-        !plain_command("grep -n \">>>>>>> \" #{file}", :bundler => false)
+        !plain_command("grep -n \">>>>>>> \" #{file}", :bundler => false, :return_boolean => true)
       end
     end
   end
 end