# File lib/git/base.rb, line 310
    def each_conflict(&block)
      self.lib.conflicts(&block)
    end