# File lib/git/lib.rb, line 478 def conflicts #yields :file, :your, :their self.unmerged.each do |f| your = Tempfile.new("YOUR-#{File.basename(f)}").path arr_opts = [":2:#{f}", ">#{your}"] command('show', arr_opts) their = Tempfile.new("THEIR-#{File.basename(f)}").path arr_opts = [":3:#{f}", ">#{their}"] command('show', arr_opts) yield(f, your, their) end end