Contents

class MergeConflict

  attr_accessor :staged_files

  def self.call
    check = new
    check.staged_files = Utils.staged_files('.')
    check.run
  end

  def run
    !system("grep '<<<<<<<' #{staged_files}")
  end

end

Version data entries

12 entries across 12 versions & 1 rubygems

Version	Path
pre-commit-0.1.12	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.11	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.10	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.9	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.8	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.7	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.6	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.5	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.4	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.3	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.2	lib/pre-commit/checks/merge_conflict.rb
pre-commit-0.1.1	lib/pre-commit/checks/merge_conflict.rb