108
118
parent_count = len(self.read_parents())
109
119
# skip the format and parent lines, and the trailing \n line.
110
120
for line in self._content[2:-1]:
121
conflict_status, rev_id, name = line.split(' ', 2)
113
123
for pos in range(parent_count):