Method: Git::Base#each_conflict

Defined in:
lib/git/base.rb

#each_conflict(&block) ⇒ Object

iterates over the files which are unmerged



340
341
342
 
# File 'lib/git/base.rb', line 340

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