← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

Switched TextMerge_lines to work on a list

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textmerge.py
54
54
                yield group
55
55
 
56
56
    def merge_lines(self, reprocess=False):
57
 
        return self.struct_to_lines(self.merge_struct(reprocess))
 
57
        struct = []
 
58
        for group in self.merge_struct(reprocess):
 
59
            struct.append(group)
 
60
        return self.struct_to_lines(struct)
58
61
 
59
62
    def merge_struct(self, reprocess=False):
60
63
        struct_iter = self.iter_useful(self._merge_struct())