lib/pre-commit/checks.rb in pre-commit-0.2.0 vs lib/pre-commit/checks.rb in pre-commit-0.3.0

@@ -54,10 +54,11 @@
   # we want, and nobody is forced to update their pre-commit binary.
   def self.checks_to_run
     checks_to_run = `git config pre-commit.checks`.chomp.split(/,\s*/).map(&:to_sym)
 
     if checks_to_run.empty?
-      Checks.values_at(:white_space, :console_log, :debugger, :tabs, :jshint, :migrations)
+      Checks.values_at(:white_space, :console_log, :debugger, :tabs, :jshint,
+        :migrations, :merge_conflict)
     else
       Checks.values_at(*checks_to_run)
     end.compact
   end