class Git::Base

def each_conflict(&block) # :yields: file, your_version, their_version
  self.lib.conflicts(&block)
end