in lib/grit/merge.rb [10:37]
def initialize(str)
status = STATUS_BOTH
section = 1
@conflicts = 0
@text = {}
lines = str.split("\n")
lines.each do |line|
if /^<<<<<<< (.*?)/.match(line)
status = STATUS_OURS
@conflicts += 1
section += 1
elsif line == '======='
status = STATUS_THEIRS
elsif /^>>>>>>> (.*?)/.match(line)
status = STATUS_BOTH
section += 1
else
@text[section] ||= {}
@text[section][status] ||= []
@text[section][status] << line
end
end
@text = @text.values
@sections = @text.size
end