Contents

require 'pre-commit/checks/grep'

module PreCommit
  module Checks
    class MergeConflict < Grep

      def message
        "detected a merge conflict\n"
      end

      def pattern
        "'<<<<<<<'"
      end

      def self.description
        "Finds files with unresolved merge conflicts."
      end

    end
  end
end

Version data entries

11 entries across 11 versions & 1 rubygems

Version	Path
pre-commit-0.19.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.18.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.17.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.16.3	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.16.2	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.16.1	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.16.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.15.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.14.1	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.14.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.13.0	lib/plugins/pre_commit/checks/merge_conflict.rb