Contents

require 'pre-commit/checks/grep'

module PreCommit
  module Checks
    class MergeConflict < Grep

      def message
        "detected a merge conflict"
      end

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

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

    end
  end
end

Version data entries

23 entries across 23 versions & 1 rubygems

Version	Path
pre-commit-0.40.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.39.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.38.1	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.38.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.37.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.36.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.35.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.34.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.33.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.32.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.31.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.30.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.29.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.28.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.27.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.26.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.25.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.24.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.23.0	lib/plugins/pre_commit/checks/merge_conflict.rb
pre-commit-0.22.1	lib/plugins/pre_commit/checks/merge_conflict.rb